Request 2632 (accepted)

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/Makefile.in Changed

@@ -3100,22 +3100,22 @@
 
 lib/libcyrus.la: $(lib_libcyrus_la_OBJECTS) $(lib_libcyrus_la_DEPENDENCIES) $(EXTRA_lib_libcyrus_la_DEPENDENCIES) lib/$(am__dirstamp)
 	$(AM_V_CCLD)$(lib_libcyrus_la_LINK) -rpath $(libdir) $(lib_libcyrus_la_OBJECTS) $(lib_libcyrus_la_LIBADD) $(LIBS)
-lib/memmove.$(OBJEXT): lib/$(am__dirstamp)
-lib/memmove.lo: lib/$(am__dirstamp)
-lib/ftruncate.$(OBJEXT): lib/$(am__dirstamp)
-lib/ftruncate.lo: lib/$(am__dirstamp)
-lib/getdtablesize.$(OBJEXT): lib/$(am__dirstamp)
-lib/getdtablesize.lo: lib/$(am__dirstamp)
 lib/strcasecmp.$(OBJEXT): lib/$(am__dirstamp)
 lib/strcasecmp.lo: lib/$(am__dirstamp)
 lib/memmem.$(OBJEXT): lib/$(am__dirstamp)
 lib/memmem.lo: lib/$(am__dirstamp)
 lib/strsep.$(OBJEXT): lib/$(am__dirstamp)
 lib/strsep.lo: lib/$(am__dirstamp)
-lib/posix_fadvise.$(OBJEXT): lib/$(am__dirstamp)
-lib/posix_fadvise.lo: lib/$(am__dirstamp)
+lib/getdtablesize.$(OBJEXT): lib/$(am__dirstamp)
+lib/getdtablesize.lo: lib/$(am__dirstamp)
 lib/strerror.$(OBJEXT): lib/$(am__dirstamp)
 lib/strerror.lo: lib/$(am__dirstamp)
+lib/memmove.$(OBJEXT): lib/$(am__dirstamp)
+lib/memmove.lo: lib/$(am__dirstamp)
+lib/ftruncate.$(OBJEXT): lib/$(am__dirstamp)
+lib/ftruncate.lo: lib/$(am__dirstamp)
+lib/posix_fadvise.$(OBJEXT): lib/$(am__dirstamp)
+lib/posix_fadvise.lo: lib/$(am__dirstamp)
 lib/lib_libcyrus_min_la-arrayu64.lo: lib/$(am__dirstamp) \
 	lib/$(DEPDIR)/$(am__dirstamp)
 lib/lib_libcyrus_min_la-assert.lo: lib/$(am__dirstamp) \

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/arbitron.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/chk_cyrus.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/ctl_cyrusdb.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/ctl_deliver.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/ctl_mboxlist.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/ctl_zoneinfo.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/cvt_cyrusdb.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/cyr_dbtool.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/cyr_deny.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/cyr_df.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/cyr_expire.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/cyr_info.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/cyr_synclog.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/cyrus.conf.5.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/deliver.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/fetchnews.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/fud.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/httpd.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/idled.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/imapd.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/imapd.conf.5.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/imclient.3.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/imtest.1.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/installsieve.1.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/ipurge.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/krb.equiv.5.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/lmtpd.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/lmtptest.1.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/master.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/mbexamine.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/mbpath.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/mupdatetest.1.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/nntpd.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/nntptest.1.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/notifyd.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/pop3d.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/pop3test.1.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/quota.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/reconstruct.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/rmnews.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/sieveshell.1.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/sivtest.1.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/smmapd.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/smtptest.1.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/squatter.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/sync_client.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/sync_reset.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/sync_server.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/timsieved.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/tls_prune.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/doc/man/unexpunge.8.html Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/imap/global.c Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/imap/imapd.c Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/imap/lmtpstats.c Changed

@@ -85,27 +85,27 @@
 
     switch (evt) {
 
-        case mtaReceivedMessages: return "Messages we've received";
+        case SIEVE_VACATION_TOTAL: return "vacation messages considered";
+        case mtaTransmittedMessages: return "Messages stored to disk";
         case AUTHENTICATION_NO: return "Failed authentication of given mechanism";
-        case SERVER_NAME_VERSION: return "Name and version string for server";
         case SIEVE_KEEP: return "sieve messages kept";
-        case SIEVE_MESSAGES_PROCESSED: return "Number of messages processed by Sieve scripts";
-        case SERVER_UPTIME: return "Amount of time server has been running";
-        case mtaReceivedVolume: return "Kbytes received";
-        case SIEVE_FILEINTO: return "sieve fileintos";
-        case mtaTransmittedMessages: return "Messages stored to disk";
-        case mtaReceivedRecipients: return "Recipients accepted";
-        case mtaTransmittedVolume: return "Kbytes stored to disk";
-        case SIEVE_REDIRECT: return "sieve redirects";
-        case SIEVE_VACATION_TOTAL: return "vacation messages considered";
-        case ACTIVE_CONNECTIONS: return "Count of the active number of connections";
+        case SIEVE_DISCARD: return "sieve discards";
+        case mtaReceivedMessages: return "Messages we've received";
+        case mtaSuccessfulConvertedMessages: return "Messages converted because of 8bit foo";
+        case SERVER_NAME_VERSION: return "Name and version string for server";
+        case TOTAL_CONNECTIONS: return "Count of the total number of connections since the beginning of time";
         case AUTHENTICATION_YES: return "Successful authentication of given mechanism";
         case SIEVE_NOTIFY: return "sieve notifications sent";
         case SIEVE_REJECT: return "sieve rejects";
-        case TOTAL_CONNECTIONS: return "Count of the total number of connections since the beginning of time";
-        case SIEVE_DISCARD: return "sieve discards";
-        case mtaSuccessfulConvertedMessages: return "Messages converted because of 8bit foo";
+        case mtaReceivedVolume: return "Kbytes received";
         case SIEVE_VACATION_REPLIED: return "vacation messages sent";
+        case ACTIVE_CONNECTIONS: return "Count of the active number of connections";
+        case SIEVE_REDIRECT: return "sieve redirects";
+        case mtaTransmittedVolume: return "Kbytes stored to disk";
+        case mtaReceivedRecipients: return "Recipients accepted";
+        case SIEVE_MESSAGES_PROCESSED: return "Number of messages processed by Sieve scripts";
+        case SERVER_UPTIME: return "Amount of time server has been running";
+        case SIEVE_FILEINTO: return "sieve fileintos";
 
     }
 
@@ -123,27 +123,27 @@
 
     switch (evt) {
 
-        case mtaReceivedMessages: snprintf(buf,buflen,"1.3.6.1.2.1.28.1.%d.1",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 mtaTransmittedMessages: snprintf(buf,buflen,"1.3.6.1.2.1.28.1.%d.3",varvalue(VARIABLE_MTA)); 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 SERVER_NAME_VERSION: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.2.3.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_MESSAGES_PROCESSED: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.0"); return buf;
-        case SERVER_UPTIME: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.2.3.1"); return buf;
-        case mtaReceivedVolume: snprintf(buf,buflen,"1.3.6.1.2.1.28.1.%d.4",varvalue(VARIABLE_MTA)); return buf;
-        case SIEVE_FILEINTO: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.4"); return buf;
-        case mtaTransmittedMessages: snprintf(buf,buflen,"1.3.6.1.2.1.28.1.%d.3",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;
-        case mtaTransmittedVolume: snprintf(buf,buflen,"1.3.6.1.2.1.28.1.%d.6",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 SIEVE_VACATION_TOTAL: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.8"); return buf;
-        case ACTIVE_CONNECTIONS: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.2.1.2"); return buf;
+        case SIEVE_DISCARD: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.2"); return buf;
+        case mtaReceivedMessages: snprintf(buf,buflen,"1.3.6.1.2.1.28.1.%d.1",varvalue(VARIABLE_MTA)); return buf;
+        case mtaSuccessfulConvertedMessages: snprintf(buf,buflen,"1.3.6.1.2.1.28.1.%d.10",varvalue(VARIABLE_MTA)); 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 TOTAL_CONNECTIONS: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.2.1.1"); 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_NOTIFY: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.6"); 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 SIEVE_DISCARD: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.2"); return buf;
-        case mtaSuccessfulConvertedMessages: snprintf(buf,buflen,"1.3.6.1.2.1.28.1.%d.10",varvalue(VARIABLE_MTA)); 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_REPLIED: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.7"); return buf;
+        case ACTIVE_CONNECTIONS: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.2.1.2"); 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 mtaReceivedRecipients: snprintf(buf,buflen,"1.3.6.1.2.1.28.1.%d.7",varvalue(VARIABLE_MTA)); 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 SERVER_UPTIME: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.2.3.1"); return buf;
+        case SIEVE_FILEINTO: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.4"); return buf;
 
     }

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/imap/lmtpstats.h Changed

@@ -21,12 +21,12 @@
 
 
 
-#define SNMPDEFINE_cmulmtp "1.3.6.1.4.1.3.2.2.3.2"
-#define SNMPDEFINE_cmutree "1.3.6.1.4.1.3.2.2.3"
-#define SNMPDEFINE_mib2 "1.3.6.1.2.1"
-#define SNMPDEFINE_mgmt "1.3.6.1.2"
 #define SNMPDEFINE_cmusieve "1.3.6.1.4.1.3.2.2.3.3"
+#define SNMPDEFINE_mgmt "1.3.6.1.2"
+#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_mib2 "1.3.6.1.2.1"
+#define SNMPDEFINE_cmutree "1.3.6.1.4.1.3.2.2.3"
 
 
 
@@ -68,27 +68,27 @@
 
 typedef enum {
 
-    mtaReceivedMessages,
+    SIEVE_VACATION_TOTAL,
+    mtaTransmittedMessages,
     AUTHENTICATION_NO,
-    SERVER_NAME_VERSION,
     SIEVE_KEEP,
-    SIEVE_MESSAGES_PROCESSED,
-    SERVER_UPTIME,
-    mtaReceivedVolume,
-    SIEVE_FILEINTO,
-    mtaTransmittedMessages,
-    mtaReceivedRecipients,
-    mtaTransmittedVolume,
-    SIEVE_REDIRECT,
-    SIEVE_VACATION_TOTAL,
-    ACTIVE_CONNECTIONS,
+    SIEVE_DISCARD,
+    mtaReceivedMessages,
+    mtaSuccessfulConvertedMessages,
+    SERVER_NAME_VERSION,
+    TOTAL_CONNECTIONS,
     AUTHENTICATION_YES,
     SIEVE_NOTIFY,
     SIEVE_REJECT,
-    TOTAL_CONNECTIONS,
-    SIEVE_DISCARD,
-    mtaSuccessfulConvertedMessages,
-    SIEVE_VACATION_REPLIED
+    mtaReceivedVolume,
+    SIEVE_VACATION_REPLIED,
+    ACTIVE_CONNECTIONS,
+    SIEVE_REDIRECT,
+    mtaTransmittedVolume,
+    mtaReceivedRecipients,
+    SIEVE_MESSAGES_PROCESSED,
+    SERVER_UPTIME,
+    SIEVE_FILEINTO
 } lmtpstats_t;

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/imap/pushstats.c Changed

@@ -85,58 +85,58 @@
 
     switch (evt) {
 
-        case GETQUOTA_COUNT: return "Number of getquota";
-        case SETQUOTA_COUNT: return "Number of setquota";
-        case STORE_COUNT: return "Number of store";
-        case SELECT_COUNT: return "Number of select";
+        case SERVER_NAME_VERSION: return "Name and version string for server";
         case EXAMINE_COUNT: return "Number of examine";
-        case CREATE_COUNT: return "Number of create";
-        case LSUB_COUNT: return "Number of lsub";
-        case LOGIN_COUNT: return "Number of login";
-        case SERVER_UPTIME: return "Amount of time server has been running";
-        case SORT_COUNT: return "Number of sort";
-        case UNSUBSCRIBE_COUNT: return "Number of unsubscribe";
-        case TOTAL_CONNECTIONS: return "Count of the total number of connections since the beginning of time";
-        case UNSELECT_COUNT: return "Number of unselect";
-        case STATUS_COUNT: return "Number of status";
-        case COMPRESS_COUNT: return "Number of compress";
+        case CHECK_COUNT: return "Number of check";
         case STARTTLS_COUNT: return "Number of starttls";
-        case LOGOUT_COUNT: return "Number of logout";
-        case GETQUOTAROOT_COUNT: return "Number of getquotaroot";
+        case UNSUBSCRIBE_COUNT: return "Number of unsubscribe";
         case RENAME_COUNT: return "Number of rename";
+        case NAMESPACE_COUNT: return "Number of namespace";
+        case SEARCH_COUNT: return "Number of search";
         case GETANNOTATION_COUNT: return "Number of getannotation";
+        case AUTHENTICATE_COUNT: return "Number of authenticate";
         case SETANNOTATION_COUNT: return "Number of setannotation";
-        case FETCH_COUNT: return "Number of fetch";
-        case COPY_COUNT: return "Number of copy";
-        case AUTHENTICATION_YES: return "Successful authentication of given mechanism";
-        case LIST_COUNT: return "Number of list";
+        case SELECT_COUNT: return "Number of select";
+        case LOGOUT_COUNT: return "Number of logout";
         case MYRIGHTS_COUNT: return "Number of myrights";
         case GETUIDS_COUNT: return "Number of getuids";
-        case IDLE_COUNT: return "Number of idle";
-        case NAMESPACE_COUNT: return "Number of namespace";
-        case ACTIVE_CONNECTIONS: return "Count of the active number of connections";
-        case THREAD_COUNT: return "Number of thread";
-        case DELETE_COUNT: return "Number of delete";
-        case AUTHENTICATE_COUNT: return "Number of authenticate";
-        case AUTHENTICATION_NO: return "Failed authentication of given mechanism";
-        case CAPABILITY_COUNT: return "Number of capability";
-        case SEARCH_COUNT: return "Number of search";
-        case SERVER_NAME_VERSION: return "Name and version string for server";
+        case SORT_COUNT: return "Number of sort";
+        case PARTIAL_COUNT: return "Number of partial";
         case CLOSE_COUNT: return "Number of close";
-        case LISTRIGHTS_COUNT: return "Number of listrights";
+        case CREATE_COUNT: return "Number of create";
+        case APPEND_COUNT: return "Number of append";
+        case ACTIVE_CONNECTIONS: return "Count of the active number of connections";
+        case TOTAL_CONNECTIONS: return "Count of the total number of connections since the beginning of time";
         case FIND_COUNT: return "Number of find";
-        case ID_COUNT: return "Number of id";
-        case SCAN_COUNT: return "Number of list";
+        case UNSELECT_COUNT: return "Number of unselect";
+        case BBOARD_COUNT: return "Number of bboard";
+        case STORE_COUNT: return "Number of store";
+        case LISTRIGHTS_COUNT: return "Number of listrights";
+        case COMPRESS_COUNT: return "Number of compress";
+        case AUTHENTICATION_NO: return "Failed authentication of given mechanism";
         case NOOP_COUNT: return "Number of noop";
         case DELETEACL_COUNT: return "Number of deleteacl";
-        case PARTIAL_COUNT: return "Number of partial";
-        case APPEND_COUNT: return "Number of append";
-        case EXPUNGE_COUNT: return "Number of expunge";
+        case COPY_COUNT: return "Number of copy";
         case SUBSCRIBE_COUNT: return "Number of subscribe";
-        case CHECK_COUNT: return "Number of check";
-        case GETACL_COUNT: return "Number of getacl";
+        case STATUS_COUNT: return "Number of status";
+        case LSUB_COUNT: return "Number of lsub";
+        case IDLE_COUNT: return "Number of idle";
+        case SERVER_UPTIME: return "Amount of time server has been running";
+        case SCAN_COUNT: return "Number of list";
+        case DELETE_COUNT: return "Number of delete";
+        case SETQUOTA_COUNT: return "Number of setquota";
+        case GETQUOTA_COUNT: return "Number of getquota";
+        case AUTHENTICATION_YES: return "Successful authentication of given mechanism";
+        case THREAD_COUNT: return "Number of thread";
+        case LIST_COUNT: return "Number of list";
         case SETACL_COUNT: return "Number of setacl";
-        case BBOARD_COUNT: return "Number of bboard";
+        case EXPUNGE_COUNT: return "Number of expunge";
+        case GETACL_COUNT: return "Number of getacl";
+        case CAPABILITY_COUNT: return "Number of capability";
+        case LOGIN_COUNT: return "Number of login";
+        case FETCH_COUNT: return "Number of fetch";
+        case ID_COUNT: return "Number of id";
+        case GETQUOTAROOT_COUNT: return "Number of getquotaroot";
 
     }
 
@@ -154,58 +154,58 @@
 
     switch (evt) {
 
-        case GETQUOTA_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.17"); return buf;
-        case SETQUOTA_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.40"); return buf;
-        case STORE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.34"); return buf;
-        case SELECT_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.35"); 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 EXAMINE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.12"); return buf;
-        case CREATE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.6"); return buf;
-        case LSUB_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.25"); return buf;
-        case LOGIN_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.22"); return buf;
-        case SERVER_UPTIME: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.3.1"); return buf;
-        case SORT_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.42"); return buf;
-        case UNSUBSCRIBE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.44"); return buf;
-        case TOTAL_CONNECTIONS: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.1.1"); return buf;
-        case UNSELECT_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.45"); return buf;
-        case STATUS_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.41"); return buf;
-        case COMPRESS_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.8"); return buf;
+        case CHECK_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.4"); return buf;
         case STARTTLS_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.33"); return buf;
-        case LOGOUT_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.23"); return buf;
-        case GETQUOTAROOT_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.18"); return buf;
+        case UNSUBSCRIBE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.44"); return buf;
         case RENAME_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.31"); return buf;
+        case NAMESPACE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.29"); return buf;
+        case SEARCH_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.36"); return buf;
         case GETANNOTATION_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.16"); return buf;
+        case AUTHENTICATE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.0"); return buf;
         case SETANNOTATION_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.39"); return buf;
-        case FETCH_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.13"); return buf;
-        case COPY_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.5"); 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 LIST_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.24"); return buf;
+        case SELECT_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.35"); return buf;
+        case LOGOUT_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.23"); return buf;
         case MYRIGHTS_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.27"); return buf;
         case GETUIDS_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.19"); return buf;
-        case IDLE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.21"); return buf;
-        case NAMESPACE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.29"); return buf;
-        case ACTIVE_CONNECTIONS: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.1.2"); return buf;
-        case THREAD_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.43"); return buf;
-        case DELETE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.9"); return buf;
-        case AUTHENTICATE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.0"); 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 CAPABILITY_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.3"); return buf;
-        case SEARCH_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.36"); 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 SORT_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.42"); return buf;
+        case PARTIAL_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.30"); return buf;
         case CLOSE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.7"); return buf;
-        case LISTRIGHTS_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.26"); return buf;
+        case CREATE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.6"); return buf;
+        case APPEND_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.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 TOTAL_CONNECTIONS: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.1.1"); return buf;
         case FIND_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.14"); return buf;
-        case ID_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.20"); return buf;
-        case SCAN_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.32"); return buf;
+        case UNSELECT_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.45"); return buf;
+        case BBOARD_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.2"); return buf;
+        case STORE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.34"); return buf;
+        case LISTRIGHTS_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.26"); return buf;
+        case COMPRESS_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.8"); 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 NOOP_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.28"); return buf;
         case DELETEACL_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.10"); 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 EXPUNGE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.11"); return buf;
+        case COPY_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.5"); return buf;
         case SUBSCRIBE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.37"); return buf;
-        case CHECK_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.4"); return buf;
-        case GETACL_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.15"); return buf;
+        case STATUS_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.41"); return buf;
+        case LSUB_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.25"); return buf;
+        case IDLE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.21"); return buf;
+        case SERVER_UPTIME: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.3.1"); return buf;
+        case SCAN_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.32"); return buf;
+        case DELETE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.9"); return buf;
+        case SETQUOTA_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.40"); return buf;
+        case GETQUOTA_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.17"); 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 THREAD_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.43"); return buf;
+        case LIST_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.24"); return buf;
         case SETACL_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.38"); return buf;
-        case BBOARD_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.2"); return buf;
+        case EXPUNGE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.11"); return buf;
+        case GETACL_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.15"); return buf;
+        case CAPABILITY_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.3"); return buf;
+        case LOGIN_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.22"); return buf;
+        case FETCH_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.13"); return buf;
+        case ID_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.20"); return buf;
+        case GETQUOTAROOT_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.18"); return buf;
 
     }

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/imap/pushstats.h Changed

@@ -64,58 +64,58 @@
 
 typedef enum {
 
-    GETQUOTA_COUNT,
-    SETQUOTA_COUNT,
-    STORE_COUNT,
-    SELECT_COUNT,
+    SERVER_NAME_VERSION,
     EXAMINE_COUNT,
-    CREATE_COUNT,
-    LSUB_COUNT,
-    LOGIN_COUNT,
-    SERVER_UPTIME,
-    SORT_COUNT,
-    UNSUBSCRIBE_COUNT,
-    TOTAL_CONNECTIONS,
-    UNSELECT_COUNT,
-    STATUS_COUNT,
-    COMPRESS_COUNT,
+    CHECK_COUNT,
     STARTTLS_COUNT,
-    LOGOUT_COUNT,
-    GETQUOTAROOT_COUNT,
+    UNSUBSCRIBE_COUNT,
     RENAME_COUNT,
+    NAMESPACE_COUNT,
+    SEARCH_COUNT,
     GETANNOTATION_COUNT,
+    AUTHENTICATE_COUNT,
     SETANNOTATION_COUNT,
-    FETCH_COUNT,
-    COPY_COUNT,
-    AUTHENTICATION_YES,
-    LIST_COUNT,
+    SELECT_COUNT,
+    LOGOUT_COUNT,
     MYRIGHTS_COUNT,
     GETUIDS_COUNT,
-    IDLE_COUNT,
-    NAMESPACE_COUNT,
-    ACTIVE_CONNECTIONS,
-    THREAD_COUNT,
-    DELETE_COUNT,
-    AUTHENTICATE_COUNT,
-    AUTHENTICATION_NO,
-    CAPABILITY_COUNT,
-    SEARCH_COUNT,
-    SERVER_NAME_VERSION,
+    SORT_COUNT,
+    PARTIAL_COUNT,
     CLOSE_COUNT,
-    LISTRIGHTS_COUNT,
+    CREATE_COUNT,
+    APPEND_COUNT,
+    ACTIVE_CONNECTIONS,
+    TOTAL_CONNECTIONS,
     FIND_COUNT,
-    ID_COUNT,
-    SCAN_COUNT,
+    UNSELECT_COUNT,
+    BBOARD_COUNT,
+    STORE_COUNT,
+    LISTRIGHTS_COUNT,
+    COMPRESS_COUNT,
+    AUTHENTICATION_NO,
     NOOP_COUNT,
     DELETEACL_COUNT,
-    PARTIAL_COUNT,
-    APPEND_COUNT,
-    EXPUNGE_COUNT,
+    COPY_COUNT,
     SUBSCRIBE_COUNT,
-    CHECK_COUNT,
-    GETACL_COUNT,
+    STATUS_COUNT,
+    LSUB_COUNT,
+    IDLE_COUNT,
+    SERVER_UPTIME,
+    SCAN_COUNT,
+    DELETE_COUNT,
+    SETQUOTA_COUNT,
+    GETQUOTA_COUNT,
+    AUTHENTICATION_YES,
+    THREAD_COUNT,
+    LIST_COUNT,
     SETACL_COUNT,
-    BBOARD_COUNT
+    EXPUNGE_COUNT,
+    GETACL_COUNT,
+    CAPABILITY_COUNT,
+    LOGIN_COUNT,
+    FETCH_COUNT,
+    ID_COUNT,
+    GETQUOTAROOT_COUNT
 } pushstats_t;

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/ptclient/ldap.c Changed

cyrus-imapd-2.5.13-40-gef1af3ec3.tar.gz/xversion.h Changed

Overview

Request 2632 (accepted)

Request History