From e8f69e29cbb319ec8876c8d1dd6f21f9a0b684e7 Mon Sep 17 00:00:00 2001 From: alexhudson Date: Sat, 1 Sep 2007 13:30:01 +0000 Subject: [PATCH] Clean up some deprecated msgapi functions --- include/msgapi.h | 361 ------------------------- src/apps/manager/manager.c | 4 +- src/libs/msgapi/msgapi.c | 5 +- src/libs/python/libbongo/msgapi-defs.c | 286 -------------------- src/libs/python/libbongo/msgapi.c | 1 - 5 files changed, 5 insertions(+), 652 deletions(-) diff --git a/include/msgapi.h b/include/msgapi.h index 9ac6c62..ee177c4 100644 --- a/include/msgapi.h +++ b/include/msgapi.h @@ -121,89 +121,6 @@ EXPORT BOOL MsgGetRecoveryFlag(void); EXPORT BOOL MsgGetServerCredential(char *buffer); -#define MSGSRV_LOCAL_SERVER NULL -#define MSGSRV_SELECTED_CONTEXT "." - -#define MSGSRV_ROOT "Bongo Services" - -#define MSGSRV_LIST_ROOT "Mailing Lists" -#define MSGSRV_PARENT_ROOT "Communities" -#define MSGSRV_TEMPLATE_ROOT "Templates" -#define MSGSRV_USER_SETTINGS_ROOT "User Settings" - -#define MSGSRV_C_ROOT "BongoServices" -#define MSGSRV_C_SERVER "BongoMessagingServer" -#define MSGSRV_C_WEBADMIN "BongoWebAdminServer" -#define MSGSRV_C_ADDRESSBOOK "BongoAddressbookAgent" -#define MSGSRV_C_AGENT "BongoAgent" -#define MSGSRV_C_ALIAS "BongoAliasAgent" -#define MSGSRV_C_ANTISPAM "BongoAntiSpamAgent" -#define MSGSRV_C_FINGER "BongoFingerAgent" -#define MSGSRV_C_GATEKEEPER "BongoConnMgrAgent" -#define MSGSRV_C_CONNMGR "BongoConnMgrAgent" -#define MSGSRV_C_IMAP "BongoIMAPAgent" -#define MSGSRV_C_LIST "BongoList" -#define MSGSRV_C_NDSLIST "BongoNDSList" -#define MSGSRV_C_LISTCONTAINER "BongoListContainer" -#define MSGSRV_C_LISTUSER "BongoListUser" -#define MSGSRV_C_LISTAGENT "BongoListAgent" -#define MSGSRV_C_STORE "BongoStoreAgent" -#define MSGSRV_C_QUEUE "BongoQueueAgent" -#define MSGSRV_C_POP "BongoPOPAgent" -#define MSGSRV_C_PROXY "BongoProxyAgent" -#define MSGSRV_C_RULESRV "BongoRuleAgent" -#define MSGSRV_C_SIGNUP "BongoSignupAgent" -#define MSGSRV_C_SMTP "BongoSMTPAgent" -#define MSGSRV_C_PARENTCONTAINER "BongoCommunityContainer" -#define MSGSRV_C_PARENTOBJECT "BongoCommunity" -#define MSGSRV_C_TEMPLATECONTAINER "BongoTemplateContainer" -#define MSGSRV_C_ITIP "BongoItipAgent" -#define MSGSRV_C_ANTIVIRUS "BongoAntiVirusAgent" -#define MSGSRV_C_RESOURCE "BongoResource" -#define MSGSRV_C_CONNMGR_MODULE "BongoConnMgrModule" -#define MSGSRV_C_CM_USER_MODULE "BongoCMUserModule" -#define MSGSRV_C_CM_LISTS_MODULE "BongoCMListsModule" -#define MSGSRV_C_CM_RBL_MODULE "BongoCMRBLModule" -#define MSGSRV_C_CM_RDNS_MODULE "BongoCMRDNSModule" -#define MSGSRV_C_CALCMD "BongoCalCmdAgent" -#define MSGSRV_C_COLLECTOR "BongoCollectorAgent" - -/* TODO: Remove MSGSRV_C_USER - This has been deprecated in favor of C_USER with MSGSRV_C_USER_SETTINGS */ -#define MSGSRV_C_USER "BongoUser" - -#define MSGSRV_C_USER_SETTINGS "BongoUserSettings" -#define MSGSRV_C_USER_SETTINGS_CONTAINER "BongoUserSettingsContainer" -#define MSGSRV_C_ORGANIZATIONAL_ROLE "BongoOrganizationalRole" -#define MSGSRV_C_ORGANIZATION "BongoOrganization" -#define MSGSRV_C_ORGANIZATIONAL_UNIT "BongoOrganizationalUnit" -#define MSGSRV_C_GROUP "BongoGroup" - -#define MSGSRV_NLM_ADDRESSBOOK "BONGOMSGLDAP.NLM" -#define MSGSRV_NLM_ALIAS "BONGOMSGALIAS.NLM" -#define MSGSRV_NLM_ANTISPAM "BONGOANTISPAM.NLM" -#define MSGSRV_NLM_FINGER "BONGOFINGER.NLM" -#define MSGSRV_NLM_GATEKEEPER "BONGOGKEEPER.NLM" -#define MSGSRV_NLM_CALCMD "BONGOCALCMD.NLM" -#define MSGSRV_NLM_CONNMGR "BONGOCONNMGR.NLM" -#define MSGSRV_NLM_IMAP "BONGOIMAP.NLM" -#define MSGSRV_NLM_LISTAGENT "BONGOIMSLIST.NLM" -#define MSGSRV_NLM_STORE "BONGOSTORE.NLM" -#define MSGSRV_NLM_QUEUE "BONGOQUEUE.NLM" -#define MSGSRV_NLM_POP "BONGOPOP3.NLM" -#define MSGSRV_NLM_PROXY "BONGOMAILPROX.NLM" -#define MSGSRV_NLM_RULESRV "BONGORULES.NLM" -#define MSGSRV_NLM_SIGNUP "BONGOMSGSGNUP.NLM" -#define MSGSRV_NLM_SMTP "BONGOSMTP.NLM" -#define MSGSRV_NLM_ITIP "BONGOITIP.NLM" -#define MSGSRV_NLM_ANTIVIRUS "BONGOAVIRUS.NLM" -#define MSGSRV_NLM_DMC "BONGODMC.NLM" -#define MSGSRV_NLM_CMUSER "BONGOCMUSER.NLM" -#define MSGSRV_NLM_CMLISTS "BONGOCMLISTS.NLM" -#define MSGSRV_NLM_CMRBL "BONGOCMRBL.NLM" -#define MSGSRV_NLM_CMRDNS "BONGOCMRDNS.NLM" -#define MSGSRV_NLM_WEBADMIN "BONGOWEBADMIN.NLM" - #define MSGSRV_AGENT_ADDRESSBOOK "Address Book Agent" #define MSGSRV_AGENT_ALIAS "Alias Agent" #define MSGSRV_AGENT_ANTISPAM "AntiSpam Agent" @@ -229,284 +146,6 @@ EXPORT BOOL MsgGetServerCredential(char *buffer); #define MSGSRV_AGENT_CMRDNS "RDNS Module" #define MSGSRV_AGENT_COLLECTOR "Collector Agent" -#define MSGSRV_A_AGENT_STATUS "BongoAgentStatus" -#define MSGSRV_A_ALIAS "BongoAlias" -#define MSGSRV_A_AUTHENTICATION_REQUIRED "BongoAuthenticationRequired" -#define MSGSRV_A_CONFIGURATION "BongoConfiguration" -#define MSGSRV_A_CLIENT "BongoClient" -#define MSGSRV_A_CONTEXT "BongoContext" -#define MSGSRV_A_DOMAIN "BongoDomain" -#define MSGSRV_A_EMAIL_ADDRESS "BongoEMailAddress" -#define MSGSRV_A_DISABLED "BongoDisabled" -#define MSGSRV_A_FINGER_MESSAGE "BongoFingerMessage" -#define MSGSRV_A_HOST "BongoHost" -#define MSGSRV_A_IP_ADDRESS "BongoIPAddress" -#define MSGSRV_A_LDAP_SERVER "BongoLDAPServer" -#define MSGSRV_A_LDAP_NMAP_SERVER "BongoLDAPNMAPServer" -#define MSGSRV_A_LDAP_SEARCH_DN "BongoLDAPSearchDN" -#define MSGSRV_A_MESSAGE_LIMIT "BongoMessageLimit" -#define MSGSRV_A_MESSAGING_SERVER "BongoMessagingServerDN" -#define MSGSRV_A_MODULE_NAME "BongoModuleName" -#define MSGSRV_A_MODULE_VERSION "BongoModuleVersion" -#define MSGSRV_A_MONITORED_QUEUE "BongoMonitoredQueue" -#define MSGSRV_A_QUEUE_SERVER "BongoQueueServer" -#define MSGSRV_A_STORE_SERVER "BongoStoreServer" -#define MSGSRV_A_OFFICIAL_NAME "BongoOfficialName" -#define MSGSRV_A_QUOTA_MESSAGE "BongoQuotaMessage" -#define MSGSRV_A_POSTMASTER "BongoPostmaster" -#define MSGSRV_A_REPLY_MESSAGE "BongoReplyMessage" -#define MSGSRV_A_URL "BongoURL" -#define MSGSRV_A_RESOLVER "BongoResolver" -#define MSGSRV_A_ROUTING "BongoRouting" -#define MSGSRV_A_SERVER_STATUS "BongoServerStatus" -#define MSGSRV_A_QUEUE_INTERVAL "BongoQueueInterval" -#define MSGSRV_A_QUEUE_TIMEOUT "BongoQueueTimeout" -#define MSGSRV_A_UID "BongoUID" -#define MSGSRV_A_VACATION_MESSAGE "BongoVacationMessage" -#define MSGSRV_A_WORD "BongoWord" -#define MSGSRV_A_MESSAGE_STORE "BongoMessageStore" -#define MSGSRV_A_FORWARDING_ADDRESS "BongoForwardingAddress" -#define MSGSRV_A_FORWARDING_ENABLED "BongoForwardingEnabled" -#define MSGSRV_A_AUTOREPLY_ENABLED "BongoVacationMessageEnabled" -#define MSGSRV_A_AUTOREPLY_MESSAGE "BongoReplyMessage" -#define MSGSRV_A_PORT "BongoPort" -#define MSGSRV_A_SSL_PORT "BongoSSLPort" -#define MSGSRV_A_SNMP_DESCRIPTION "BongoSNMPDescription" -#define MSGSRV_A_SNMP_VERSION "BongoSNMPVersion" -#define MSGSRV_A_SNMP_ORGANIZATION "BongoSNMPOrganization" -#define MSGSRV_A_SNMP_LOCATION "BongoSNMPLocation" -#define MSGSRV_A_SNMP_CONTACT "BongoSNMPContact" -#define MSGSRV_A_SNMP_NAME "BongoSNMPName" -#define MSGSRV_A_MESSAGING_DISABLED "BongoMessagingDisabled" -#define MSGSRV_A_STORE_TRUSTED_HOSTS "BongoStoreTrustedHosts" -#define MSGSRV_A_QUOTA_VALUE "BongoQuotaValue" -#define MSGSRV_A_SCMS_USER_THRESHOLD "BongoSCMSUserThreshold" -#define MSGSRV_A_SCMS_SIZE_THRESHOLD "BongoSCMSSizeThreshold" -#define MSGSRV_A_SMTP_VERIFY_ADDRESS "BongoSMTPVerifyAddress" -#define MSGSRV_A_SMTP_ALLOW_AUTH "BongoSMTPAllowAUTH" -#define MSGSRV_A_SMTP_ALLOW_VRFY "BongoSMTPAllowVRFY" -#define MSGSRV_A_SMTP_ALLOW_EXPN "BongoSMTPAllowEXPN" -#define MSGSRV_A_WORK_DIRECTORY "BongoWorkDirectory" -#define MSGSRV_A_LOGLEVEL "BongoLoglevel" -#define MSGSRV_A_MINIMUM_SPACE "BongoMinimumFreeSpace" -#define MSGSRV_A_SMTP_SEND_ETRN "BongoSMTPSendETRN" -#define MSGSRV_A_SMTP_ACCEPT_ETRN "BongoSMTPAcceptETRN" -#define MSGSRV_A_LIMIT_REMOTE_PROCESSING "BongoLimitRemoteProcessing" -#define MSGSRV_A_LIMIT_REMOTE_START_WD "BongoLimitRemoteBegWeekday" -#define MSGSRV_A_LIMIT_REMOTE_END_WD "BongoLimitRemoteEndWeekday" -#define MSGSRV_A_LIMIT_REMOTE_START_WE "BongoLimitRemoteBegWeekend" -#define MSGSRV_A_LIMIT_REMOTE_END_WE "BongoLimitRemoteEndWeekend" -#define MSGSRV_A_PRODUCT_VERSION "BongoProductVersion" -#define MSGSRV_A_PROXY_LIST "BongoProxyList" -#define MSGSRV_A_MAXIMUM_ITEMS "BongoMaximumItems" -#define MSGSRV_A_TIME_INTERVAL "BongoTimeInterval" -#define MSGSRV_A_RELAYHOST "BongoRelayHost" -#define MSGSRV_A_ALIAS_OPTIONS "BongoAliasOptions" -#define MSGSRV_A_LDAP_OPTIONS "BongoLDAPOptions" -#define MSGSRV_A_CUSTOM_ALIAS "BongoCustomAlias" -#define MSGSRV_A_ADVERTISING_CONFIG "BongoAdvertisingConfig" -#define MSGSRV_A_LANGUAGE "BongoLanguage" -#define MSGSRV_A_PREFERENCES "BongoPreferences" -#define MSGSRV_A_QUOTA_WARNING "BongoQuotaWarning" -#define MSGSRV_A_QUEUE_TUNING "BongoQueueTuning" -#define MSGSRV_A_TIMEOUT "BongoTimeout" -#define MSGSRV_A_PRIVACY "BongoPrivacy" -#define MSGSRV_A_THREAD_LIMIT "BongoThreadLimit" -#define MSGSRV_A_DBF_PAGESIZE "BongoDBFPageSize" -#define MSGSRV_A_DBF_KEYSIZE "BongoDBFKeySize" -#define MSGSRV_A_ADDRESSBOOK_CONFIG "BongoAddressbookConfig" -#define MSGSRV_A_ADDRESSBOOK_URL_SYSTEM "BongoAddressbookURLSystem" -#define MSGSRV_A_ADDRESSBOOK_URL_PUBLIC "BongoAddressbookURLPublic" -#define MSGSRV_A_ADDRESSBOOK "BongoAddressbook" -#define MSGSRV_A_SERVER_STANDALONE "BongoServerStandalone" -#define MSGSRV_A_FORWARD_UNDELIVERABLE "BongoForwardUndeliverable" -#define MSGSRV_A_PHRASE "BongoPhrase" -#define MSGSRV_A_ACCOUNTING_ENABLED "BongoAccountingEnabled" -#define MSGSRV_A_ACCOUNTING_DATA "BongoAccountingData" -#define MSGSRV_A_BILLING_DATA "BongoBillingData" -#define MSGSRV_A_BLOCKED_ADDRESS "BongoBlockedAddress" -#define MSGSRV_A_ALLOWED_ADDRESS "BongoAllowedAddress" -#define MSGSRV_A_RECIPIENT_LIMIT "BongoRecipientLimit" -#define MSGSRV_A_RBL_HOST "BongoRBLHost" -#define MSGSRV_A_SIGNATURE "BongoSignature" -#define MSGSRV_A_CONNMGR "BongoConnMgr" -#define MSGSRV_A_CONNMGR_CONFIG "BongoConnMgrConfig" -#define MSGSRV_A_USER_DOMAIN "BongoUserDomain" -#define MSGSRV_A_RTS_ANTISPAM_CONFIG "BongoRTSAntispamConfig" -#define MSGSRV_A_SPOOL_DIRECTORY "BongoSpoolDirectory" -#define MSGSRV_A_SCMS_DIRECTORY "BongoSCMSDirectory" -#define MSGSRV_A_STORE_SYSTEM_DIRECTORY "BongoStoreSystemDirectory" -#define MSGSRV_A_DBF_DIRECTORY "BongoDBFDirectory" -#define MSGSRV_A_NLS_DIRECTORY "BongoNLSDirectory" -#define MSGSRV_A_BIN_DIRECTORY "BongoBinDirectory" -#define MSGSRV_A_LIB_DIRECTORY "BongoLibDirectory" -#define MSGSRV_A_DEFAULT_CHARSET "BongoDefaultCharset" -#define MSGSRV_A_RULE "BongoRule" -#define MSGSRV_A_RELAY_DOMAIN "BongoRelayDomain" -#define MSGSRV_A_LIST_DIGESTTIME "BongoListDigestTime" -#define MSGSRV_A_LIST_ABSTRACT "BongoListAbstract" -#define MSGSRV_A_LIST_DESCRIPTION "BongoListDescription" -#define MSGSRV_A_LIST_CONFIGURATION "BongoListConfiguration" -#define MSGSRV_A_LIST_STORE "BongoListStore" -#define MSGSRV_A_LIST_NMAPSTORE "BongoListNMAPStore" -#define MSGSRV_A_LIST_MODERATOR "BongoListModerator" -#define MSGSRV_A_LIST_OWNER "BongoListOwner" -#define MSGSRV_A_LIST_SIGNATURE "BongoListSignature" -#define MSGSRV_A_LIST_SIGNATURE_HTML "BongoListSignatureHTML" -#define MSGSRV_A_LIST_DIGEST_VERSION "BongoListDigestVersion" -#define MSGSRV_A_LIST_MEMBERS "BongoListMembers" -#define MSGSRV_A_LISTUSER_OPTIONS "BongoListUserOptions" -#define MSGSRV_A_LISTUSER_ADMINOPTIONS "BongoListUserAdminOptions" -#define MSGSRV_A_LISTUSER_PASSWORD "BongoListUserPassword" -#define MSGSRV_A_FEATURE_SET "BongoFeatureSet" -#define MSGSRV_A_PRIVATE_KEY_LOCATION "BongoPKeyFile" -#define MSGSRV_A_CERTIFICATE_LOCATION "BongoCAFile" -#define MSGSRV_A_CONFIG_CHANGED "BongoConfigVersion" -#define MSGSRV_A_LISTSERVER_NAME "BongoListServerName" -#define MSGSRV_A_LIST_WELCOME_MESSAGE "BongoListWelcomeMessage" -#define MSGSRV_A_PARENT_OBJECT "BongoCommunityDN" -#define MSGSRV_A_FEATURE_INHERITANCE "BongoFeatureInheritance" -#define MSGSRV_A_TEMPLATE "BongoTemplate" -#define MSGSRV_A_TIMEZONE "BongoTimezone" -#define MSGSRV_A_LOCALE "BongoLocale" -#define MSGSRV_A_PASSWORD_CONFIGURATION "BongoPasswordConfig" -#define MSGSRV_A_TITLE "BongoTitle" -#define MSGSRV_A_DEFAULT_TEMPLATE "BongoDefaultTemplate" -#define MSGSRV_A_TOM_MANAGER "BongoCommunityManager" -#define MSGSRV_A_TOM_CONTEXTS "BongoCommunityContexts" -#define MSGSRV_A_TOM_DOMAINS "BongoCommunityDomains" -#define MSGSRV_A_TOM_OPTIONS "BongoCommunityOptions" -#define MSGSRV_A_DESCRIPTION "BongoDescription" -#define MSGSRV_A_STATSERVER_1 "BongoStatServer1" -#define MSGSRV_A_STATSERVER_2 "BongoStatServer2" -#define MSGSRV_A_STATSERVER_3 "BongoStatServer3" -#define MSGSRV_A_STATSERVER_4 "BongoStatServer4" -#define MSGSRV_A_STATSERVER_5 "BongoStatServer5" -#define MSGSRV_A_STATSERVER_6 "BongoStatServer6" -#define MSGSRV_A_NEWS "BongoNews" -#define MSGSRV_A_MANAGER "BongoManager" -#define MSGSRV_A_AVAILABLE_SHARES "BongoAvailableShares" -#define MSGSRV_A_OWNED_SHARES "BongoOwnedShares" -#define MSGSRV_A_NEW_SHARE_MESSAGE "BongoNewShareMessage" -#define MSGSRV_A_AVAILABLE_PROXIES "BongoAvailableProxies" -#define MSGSRV_A_OWNED_PROXIES "BongoOwnedProxies" -#define MSGSRV_A_RESOURCE_MANAGER "BongoManager" -#define MSGSRV_A_BONGO_MESSAGING_SERVER "BongoMessagingServer" -#define MSGSRV_A_ACL "BongoACL" -#define MSGSRV_A_WA_DEFAULT_TEMPLATE "WebAdminDefaultTemplate" -#define MSGSRV_A_WA_ALLOWED_TEMPLATES "WebAdminAllowedTemplates" -#define MSGSRV_A_WA_DISALLOWED_TEMPLATES "WebAdminDisallowedTemplates" -#define MSGSRV_A_SMS_AUTHORIZED_PHONES "BongoSMSAuthorizedPhones" -#define MSGSRV_A_CALCMD_ADDRESS_SUFFIX "BongoCalCmdAddressSuffix" -#define MSGSRV_A_SPAMD_ENABLED "BongoSpamdEnabled" -#define MSGSRV_A_SPAMD_TIMEOUT "BongoSpamdConnectionTimeout" -#define MSGSRV_A_SPAMD_THRESHOLD_HEAD "BongoSpamdHeaderThreshold" -#define MSGSRV_A_SPAMD_THRESHOLD_DROP "BongoSpamdDropThreshold" -#define MSGSRV_A_SPAMD_QUARANTINE_Q "BongoSpamdQuarantineQueue" -#define MSGSRV_A_SPAMD_HOST "BongoSpamdHost" -#define MSGSRV_A_SPAMD_FEEDBACK_HOST "BongoSpamdFeedbackHost" -#define MSGSRV_A_SPAMD_FEEDBACK_ENABLED "BongoSpamdFeedbackEnabled" -#define MSGSRV_A_MAX_LOAD "BongoMaxLoad" -#define MSGSRV_A_ACL_ENABLED "BongoACLEnabled" -#define MSGSRV_A_UBE_SMTP_AFTER_POP "BongoUBESMTPAfterPOP" -#define MSGSRV_A_UBE_REMOTE_AUTH_ONLY "BongoUBERemoteAuthOnly" -#define MSGSRV_A_MAX_FLOOD_COUNT "BongoMaxFloodCount" -#define MSGSRV_A_MAX_NULL_SENDER_RECIPS "BongoMaxNullSenderRecips" -#define MSGSRV_A_MAX_MX_SERVERS "BongoMaxMXServers" -#define MSGSRV_A_RELAY_LOCAL_MAIL "BongoRelayLocalMail" -#define MSGSRV_A_CLUSTERED "BongoClustered" -#define MSGSRV_A_FORCE_BIND "BongoForceBind" -#define MSGSRV_A_SSL_TLS "BongoSSLTLS" -#define MSGSRV_A_SSL_ALLOW_CHAINED "BongoSSLAllowChained" -#define MSGSRV_A_BOUNCE_RETURN "BongoBounceReturn" -#define MSGSRV_A_BOUNCE_CC_POSTMASTER "BongoBounceCCPostmaster" -#define MSGSRV_A_QUOTA_USER "BongoQuotaUser" -#define MSGSRV_A_QUOTA_SYSTEM "BongoQuotaSystem" -#define MSGSRV_A_REGISTER_QUEUE "BongoRegisterQueue" -#define MSGSRV_A_QUEUE_LIMIT_BOUNCES "BongoQueueLimitBounces" -#define MSGSRV_A_LIMIT_BOUNCE_ENTRIES "BongoLimitBounceEntries" -#define MSGSRV_A_LIMIT_BOUNCE_INTERVAL "BongoLimitBounceInterval" -#define MSGSRV_A_DOMAIN_ROUTING "BongoDomainRouting" -#define MSGSRV_A_MONITOR_INTERVAL "BongoMonitorInterval" -#define MSGSRV_A_MANAGER_PORT "BongoManagerPort" -#define MSGSRV_A_MANAGER_SSL_PORT "BongoManagerSSLPort" - -#define PLUSPACK_AGENT "PlusPack Agent" -#define PLUSPACK_C "PlusPackAgent" -#define PLUSPACK_NLM "BONGOPLUSPACK.NLM" -#define PLUSPACK_A_ACL_GROUP "PlusPackACLGroup" -#define PLUSPACK_A_COPY_USER "PlusPackCopyUser" -#define PLUSPACK_A_COPY_MBOX "PlusPackCopyMBOX" - -#define MSGSRV_LOAD_AGENT 1 -#define MSGSRV_UNLOAD_AGENT 2 -#define MSGSRV_RESTART_AGENT 3 -#define MSGSRV_GET_STATS 4 -#define MSGSRV_RESET_STATS 5 -#define MSGSRV_GET_SPAM_STATS 6 - -#define MSGSRV_SUCCESS 1 -#define MSGSRV_NOT_AUTHORIZED 2 -#define MSGSRV_UNKNOWN_REQUEST 3 -#define MSGSRV_WRONG_ARGUMENTS 4 - -#define MSGSRV_MODULES_LOADED 0 /* Private */ -#define MSGSRV_UNAUTHORIZED 1 /* Increments */ -#define MSGSRV_WRONG_PASSWORD 2 /* Increments */ -#define MSGSRV_DELIVERY_FAILED_LOCAL 3 /* Increments */ -#define MSGSRV_DELIVERY_FAILED_REMOTE 4 /* Increments */ - -#define MSGSRV_INCOMING_CLIENT 5 /* Increments */ -#define MSGSRV_INCOMING_SERVER 6 /* Increments */ -#define MSGSRV_SERVICED_CLIENT 7 /* Increments, also decrements MSGSRV_INCOMING_CLIENTS */ -#define MSGSRV_SERVICED_SERVER 8 /* Increments, also decrements MSGSRV_INCOMING_SERVERS */ -#define MSGSRV_OUTGOING_SERVER 9 /* Increments */ -#define MSGSRV_CLOSED_OUT_SERVER 10 /* Increments, also decrements MSGSRV_OUTGOING_SERVERS */ - -#define MSGSRV_INCOMING_Q_AGENT 11 /* Increments/Decrements */ -#define MSGSRV_OUTGOING_Q_AGENT 12 /* Increments/Decrements */ -#define MSGSRV_STORE_AGENT 13 /* Increments */ - -#define MSGSRV_MSG_RECEIVED_LOCAL 15 /* Value +/- */ -#define MSGSRV_MSG_RECEIVED_REMOTE 16 /* Value +/- */ -#define MSGSRV_MSG_STORED_LOCAL 17 /* Value +/- */ -#define MSGSRV_MSG_STORED_REMOTE 18 /* Value +/- */ -#define MSGSRV_MSG_QUEUED_LOCAL 19 /* Value +/- */ -#define MSGSRV_MSG_QUEUED_REMOTE 20 /* Value +/- */ - -#define MSGSRV_BYTE_RECEIVED_LOCAL 21 /* Value +/- */ -#define MSGSRV_BYTE_RECEIVED_REMOTE 22 /* Value +/- */ -#define MSGSRV_BYTE_STORED_LOCAL 23 /* Value +/- */ -#define MSGSRV_BYTE_STORED_REMOTE 24 /* Value +/- */ - -#define MSGSRV_RCPT_RECEIVED_LOCAL 25 /* Value +/- */ -#define MSGSRV_RCPT_RECEIVED_REMOTE 26 /* Value +/- */ -#define MSGSRV_RCPT_STORED_LOCAL 27 /* Value +/- */ -#define MSGSRV_RCPT_STORED_REMOTE 28 /* Value +/- */ - -#define MSGSRV_SPAM_QUEUESPAM 29 /* Increments */ -#define MSGSRV_SPAM_ADDRESS_BLOCKED 30 /* Increments */ -#define MSGSRV_SPAM_MAPS_BLOCKED 31 /* Increments */ -#define MSGSRV_SPAM_DENIED_ROUTING 32 /* Increments */ -#define MSGSRV_SPAM_NO_DNS_ENTRY 33 /* Increments */ - -#define MSGSRV_NMAP_TO_NMAP_AGENT 34 /* Increments */ - -#define MSGSRV_SPAM_MESSAGES_SCANNED 35 /* Increments */ -#define MSGSRV_SPAM_ATTACHMENTS_SCANNED 36 /* Increments */ -#define MSGSRV_SPAM_ATTACHMENTS_BLOCKED 37 /* Increments */ -#define MSGSRV_SPAM_VIRUSES_FOUND 38 /* Increments */ -#define MSGSRV_SPAM_VIRUSES_BLOCKED 39 /* Increments */ -#define MSGSRV_SPAM_VIRUSES_CURED 40 /* Increments */ - -#define MSGSRV_MAX_STAT_COUNT 41 /* How many stat entries are there? */ - -#define MSGSRV_STAT_UP 1 -#define MSGSRV_STAT_DOWN -1 - -#define MSGSRV_TRAP_ILLEGALACCESS 3 -#define MSGSRV_TRAP_OTHER 4 - /* Global configuration file. See MsgGetConfigProperty() */ #define MSGSRV_CONFIG_FILENAME "bongo.conf" #define MSGSRV_CONFIG_MAX_PROP_CHARS 255 diff --git a/src/apps/manager/manager.c b/src/apps/manager/manager.c index c2b3233..184f360 100644 --- a/src/apps/manager/manager.c +++ b/src/apps/manager/manager.c @@ -605,7 +605,7 @@ StartSlapd(BOOL killExisting) } /* read config */ - +#if 0 if (!MsgGetConfigProperty((unsigned char *) buf, (unsigned char *) MSGSRV_CONFIG_PROP_MANAGED_SLAPD_PORT)) { fprintf(stderr, _("bongo-manager: error reading managed slapd port from config file.\n")); @@ -684,7 +684,7 @@ StartSlapd(BOOL killExisting) break; } close(sockfd); - +#endif return err; } diff --git a/src/libs/msgapi/msgapi.c b/src/libs/msgapi/msgapi.c index c8a8fa7..f8c1097 100644 --- a/src/libs/msgapi/msgapi.c +++ b/src/libs/msgapi/msgapi.c @@ -358,6 +358,7 @@ MsgLibraryStop(void) return(TRUE); } +#if 0 /** * Get a config property from global configuration file. Removes dependency * on NCPServer object in the directory (as well as others). See msgapi.h for @@ -373,8 +374,7 @@ MsgGetConfigProperty(unsigned char *Buffer, unsigned char *Property) int len; char conf_path[FILENAME_MAX]; - snprintf(conf_path, FILENAME_MAX, "%s/%s", XPL_DEFAULT_CONF_DIR, - MSGSRV_CONFIG_FILENAME); + snprintf(conf_path, FILENAME_MAX, "%s/bongo.conf", XPL_DEFAULT_CONF_DIR); if (!(fh = fopen(conf_path, "r"))) { return result; @@ -404,6 +404,7 @@ MsgGetConfigProperty(unsigned char *Buffer, unsigned char *Property) fclose(fh); return result; } +#endif void MsgGetUid(char *buffer, int buflen) diff --git a/src/libs/python/libbongo/msgapi-defs.c b/src/libs/python/libbongo/msgapi-defs.c index a295828..f61e037 100644 --- a/src/libs/python/libbongo/msgapi-defs.c +++ b/src/libs/python/libbongo/msgapi-defs.c @@ -1,294 +1,8 @@ #include #include "msgapi-defs.h" -PyObject * -msgapi_GetConfigProperty(PyObject *self, PyObject *args) -{ - unsigned char *property; - unsigned char buf[256]; //MSGSRV_CONFIG_MAX_PROP_CHARS + 1 - - if (!PyArg_ParseTuple(args, "s", &property)) { - return NULL; - } - if(MsgGetConfigProperty(buf, property)) { - return Py_BuildValue("s", buf); - } - return NULL; -} - PyObject * msgapi_GetUnprivilegedUser(PyObject *self, PyObject *args) { return Py_BuildValue("z", MsgGetUnprivilegedUser()); } - -EnumItemDef MsgApiEnums[] = { - {"MAX_PROP_CHARS", MSGSRV_CONFIG_MAX_PROP_CHARS, NULL}, - {"MESSAGING_SERVER", 0, MSGSRV_CONFIG_PROP_MESSAGING_SERVER}, - {"WEB_ADMIN_SERVER", 0, MSGSRV_CONFIG_PROP_WEB_ADMIN_SERVER}, - {"DEFAULT_CONTEXT", 0, MSGSRV_CONFIG_PROP_DEFAULT_CONTEXT}, - {"BONGO_SERVICES", 0, MSGSRV_CONFIG_PROP_BONGO_SERVICES}, - {"CONFIG_FILENAME", 0, MSGSRV_CONFIG_FILENAME}, - {"ROOT", 0, MSGSRV_ROOT}, - {"USER_SETTINGS_ROOT", 0, MSGSRV_USER_SETTINGS_ROOT}, - {"C_ROOT", 0, MSGSRV_C_ROOT}, - {"C_SERVER", 0, MSGSRV_C_SERVER}, - {"C_WEBADMIN", 0, MSGSRV_C_WEBADMIN}, - {"C_ADDRESSBOOK", 0, MSGSRV_C_ADDRESSBOOK}, - {"C_AGENT", 0, MSGSRV_C_AGENT}, - {"C_ALIAS", 0, MSGSRV_C_ALIAS}, - {"C_ANTISPAM", 0, MSGSRV_C_ANTISPAM}, - {"C_FINGER", 0, MSGSRV_C_FINGER}, - {"C_GATEKEEPER", 0, MSGSRV_C_GATEKEEPER}, - {"C_CONNMGR", 0, MSGSRV_C_CONNMGR}, - {"C_IMAP", 0, MSGSRV_C_IMAP}, - {"C_LIST", 0, MSGSRV_C_LIST}, - {"C_NDSLIST", 0, MSGSRV_C_NDSLIST}, - {"C_LISTCONTAINER", 0, MSGSRV_C_LISTCONTAINER}, - {"C_LISTUSER", 0, MSGSRV_C_LISTUSER}, - {"C_LISTAGENT", 0, MSGSRV_C_LISTAGENT}, - {"C_STORE", 0, MSGSRV_C_STORE}, - {"C_QUEUE", 0, MSGSRV_C_QUEUE}, - {"C_POP", 0, MSGSRV_C_POP}, - {"C_PROXY", 0, MSGSRV_C_PROXY}, - {"C_RULESRV", 0, MSGSRV_C_RULESRV}, - {"C_SIGNUP", 0, MSGSRV_C_SIGNUP}, - {"C_SMTP", 0, MSGSRV_C_SMTP}, - {"C_PARENTCONTAINER", 0, MSGSRV_C_PARENTCONTAINER}, - {"C_PARENTOBJECT", 0, MSGSRV_C_PARENTOBJECT}, - {"C_TEMPLATECONTAINER", 0, MSGSRV_C_TEMPLATECONTAINER}, - {"C_ITIP", 0, MSGSRV_C_ITIP}, - {"C_ANTIVIRUS", 0, MSGSRV_C_ANTIVIRUS}, - {"C_RESOURCE", 0, MSGSRV_C_RESOURCE}, - {"C_CONNMGR_MODULE", 0, MSGSRV_C_CONNMGR_MODULE}, - {"C_CM_USER_MODULE", 0, MSGSRV_C_CM_USER_MODULE}, - {"C_CM_LISTS_MODULE", 0, MSGSRV_C_CM_LISTS_MODULE}, - {"C_CM_RBL_MODULE", 0, MSGSRV_C_CM_RBL_MODULE}, - {"C_CM_RDNS_MODULE", 0, MSGSRV_C_CM_RDNS_MODULE}, - {"C_CALCMD", 0, MSGSRV_C_CALCMD}, - {"C_COLLECTOR", 0, MSGSRV_C_COLLECTOR}, - {"C_USER", 0, MSGSRV_C_USER}, - {"C_ORGANIZATIONAL_ROLE", 0, MSGSRV_C_ORGANIZATIONAL_ROLE}, - {"C_ORGANIZATION", 0, MSGSRV_C_ORGANIZATION}, - {"C_ORGANIZATIONAL_UNIT", 0, MSGSRV_C_ORGANIZATIONAL_UNIT}, - {"C_GROUP", 0, MSGSRV_C_GROUP}, - {"C_USER_SETTINGS_CONTAINER", 0, MSGSRV_C_USER_SETTINGS_CONTAINER}, - {"C_USER_SETTINGS", 0, MSGSRV_C_USER_SETTINGS}, - {"AGENT_ADDRESSBOOK", 0, MSGSRV_AGENT_ADDRESSBOOK}, - {"AGENT_ALIAS", 0, MSGSRV_AGENT_ALIAS}, - {"AGENT_ANTISPAM", 0, MSGSRV_AGENT_ANTISPAM}, - {"AGENT_FINGER", 0, MSGSRV_AGENT_FINGER}, - {"AGENT_GATEKEEPER", 0, MSGSRV_AGENT_GATEKEEPER}, - {"AGENT_CALCMD", 0, MSGSRV_AGENT_CALCMD}, - {"AGENT_CONNMGR", 0, MSGSRV_AGENT_CONNMGR}, - {"AGENT_IMAP", 0, MSGSRV_AGENT_IMAP}, - {"AGENT_LIST", 0, MSGSRV_AGENT_LIST}, - {"AGENT_STORE", 0, MSGSRV_AGENT_STORE}, - {"AGENT_QUEUE", 0, MSGSRV_AGENT_QUEUE}, - {"AGENT_POP", 0, MSGSRV_AGENT_POP}, - {"AGENT_PROXY", 0, MSGSRV_AGENT_PROXY}, - {"AGENT_RULESRV", 0, MSGSRV_AGENT_RULESRV}, - {"AGENT_SIGNUP", 0, MSGSRV_AGENT_SIGNUP}, - {"AGENT_SMTP", 0, MSGSRV_AGENT_SMTP}, - {"AGENT_ITIP", 0, MSGSRV_AGENT_ITIP}, - {"AGENT_ANTIVIRUS", 0, MSGSRV_AGENT_ANTIVIRUS}, - {"AGENT_DMC", 0, MSGSRV_AGENT_DMC}, - {"AGENT_CMUSER", 0, MSGSRV_AGENT_CMUSER}, - {"AGENT_CMLISTS", 0, MSGSRV_AGENT_CMLISTS}, - {"AGENT_CMRBL", 0, MSGSRV_AGENT_CMRBL}, - {"AGENT_CMRDNS", 0, MSGSRV_AGENT_CMRDNS}, - {"AGENT_COLLECTOR", 0, MSGSRV_AGENT_COLLECTOR}, - {"A_AGENT_STATUS", 0, MSGSRV_A_AGENT_STATUS}, - {"A_ALIAS", 0, MSGSRV_A_ALIAS}, - {"A_AUTHENTICATION_REQUIRED", 0, MSGSRV_A_AUTHENTICATION_REQUIRED}, - {"A_CONFIGURATION", 0, MSGSRV_A_CONFIGURATION}, - {"A_CLIENT", 0, MSGSRV_A_CLIENT}, - {"A_CONTEXT", 0, MSGSRV_A_CONTEXT}, - {"A_DOMAIN", 0, MSGSRV_A_DOMAIN}, - {"A_EMAIL_ADDRESS", 0, MSGSRV_A_EMAIL_ADDRESS}, - {"A_DISABLED", 0, MSGSRV_A_DISABLED}, - {"A_FINGER_MESSAGE", 0, MSGSRV_A_FINGER_MESSAGE}, - {"A_HOST", 0, MSGSRV_A_HOST}, - {"A_IP_ADDRESS", 0, MSGSRV_A_IP_ADDRESS}, - {"A_LDAP_SERVER", 0, MSGSRV_A_LDAP_SERVER}, - {"A_LDAP_NMAP_SERVER", 0, MSGSRV_A_LDAP_NMAP_SERVER}, - {"A_LDAP_SEARCH_DN", 0, MSGSRV_A_LDAP_SEARCH_DN}, - {"A_MESSAGE_LIMIT", 0, MSGSRV_A_MESSAGE_LIMIT}, - {"A_MESSAGING_SERVER", 0, MSGSRV_A_MESSAGING_SERVER}, - {"A_MODULE_NAME", 0, MSGSRV_A_MODULE_NAME}, - {"A_MODULE_VERSION", 0, MSGSRV_A_MODULE_VERSION}, - {"A_MONITORED_QUEUE", 0, MSGSRV_A_MONITORED_QUEUE}, - {"A_QUEUE_SERVER", 0, MSGSRV_A_QUEUE_SERVER}, - {"A_STORE_SERVER", 0, MSGSRV_A_STORE_SERVER}, - {"A_OFFICIAL_NAME", 0, MSGSRV_A_OFFICIAL_NAME}, - {"A_QUOTA_MESSAGE", 0, MSGSRV_A_QUOTA_MESSAGE}, - {"A_POSTMASTER", 0, MSGSRV_A_POSTMASTER}, - {"A_REPLY_MESSAGE", 0, MSGSRV_A_REPLY_MESSAGE}, - {"A_URL", 0, MSGSRV_A_URL}, - {"A_RESOLVER", 0, MSGSRV_A_RESOLVER}, - {"A_ROUTING", 0, MSGSRV_A_ROUTING}, - {"A_SERVER_STATUS", 0, MSGSRV_A_SERVER_STATUS}, - {"A_QUEUE_INTERVAL", 0, MSGSRV_A_QUEUE_INTERVAL}, - {"A_QUEUE_TIMEOUT", 0, MSGSRV_A_QUEUE_TIMEOUT}, - {"A_UID", 0, MSGSRV_A_UID}, - {"A_VACATION_MESSAGE", 0, MSGSRV_A_VACATION_MESSAGE}, - {"A_WORD", 0, MSGSRV_A_WORD}, - {"A_MESSAGE_STORE", 0, MSGSRV_A_MESSAGE_STORE}, - {"A_FORWARDING_ADDRESS", 0, MSGSRV_A_FORWARDING_ADDRESS}, - {"A_FORWARDING_ENABLED", 0, MSGSRV_A_FORWARDING_ENABLED}, - {"A_AUTOREPLY_ENABLED", 0, MSGSRV_A_AUTOREPLY_ENABLED}, - {"A_AUTOREPLY_MESSAGE", 0, MSGSRV_A_AUTOREPLY_MESSAGE}, - {"A_PORT", 0, MSGSRV_A_PORT}, - {"A_SSL_PORT", 0, MSGSRV_A_SSL_PORT}, - {"A_SNMP_DESCRIPTION", 0, MSGSRV_A_SNMP_DESCRIPTION}, - {"A_SNMP_VERSION", 0, MSGSRV_A_SNMP_VERSION}, - {"A_SNMP_ORGANIZATION", 0, MSGSRV_A_SNMP_ORGANIZATION}, - {"A_SNMP_LOCATION", 0, MSGSRV_A_SNMP_LOCATION}, - {"A_SNMP_CONTACT", 0, MSGSRV_A_SNMP_CONTACT}, - {"A_SNMP_NAME", 0, MSGSRV_A_SNMP_NAME}, - {"A_MESSAGING_DISABLED", 0, MSGSRV_A_MESSAGING_DISABLED}, - {"A_STORE_TRUSTED_HOSTS", 0, MSGSRV_A_STORE_TRUSTED_HOSTS}, - {"A_QUOTA_VALUE", 0, MSGSRV_A_QUOTA_VALUE}, - {"A_SCMS_USER_THRESHOLD", 0, MSGSRV_A_SCMS_USER_THRESHOLD}, - {"A_SCMS_SIZE_THRESHOLD", 0, MSGSRV_A_SCMS_SIZE_THRESHOLD}, - {"A_SMTP_VERIFY_ADDRESS", 0, MSGSRV_A_SMTP_VERIFY_ADDRESS}, - {"A_SMTP_ALLOW_AUTH", 0, MSGSRV_A_SMTP_ALLOW_AUTH}, - {"A_SMTP_ALLOW_VRFY", 0, MSGSRV_A_SMTP_ALLOW_VRFY}, - {"A_SMTP_ALLOW_EXPN", 0, MSGSRV_A_SMTP_ALLOW_EXPN}, - {"A_WORK_DIRECTORY", 0, MSGSRV_A_WORK_DIRECTORY}, - {"A_LOGLEVEL", 0, MSGSRV_A_LOGLEVEL}, - {"A_MINIMUM_SPACE", 0, MSGSRV_A_MINIMUM_SPACE}, - {"A_SMTP_SEND_ETRN", 0, MSGSRV_A_SMTP_SEND_ETRN}, - {"A_SMTP_ACCEPT_ETRN", 0, MSGSRV_A_SMTP_ACCEPT_ETRN}, - {"A_LIMIT_REMOTE_PROCESSING", 0, MSGSRV_A_LIMIT_REMOTE_PROCESSING}, - {"A_LIMIT_REMOTE_START_WD", 0, MSGSRV_A_LIMIT_REMOTE_START_WD}, - {"A_LIMIT_REMOTE_END_WD", 0, MSGSRV_A_LIMIT_REMOTE_END_WD}, - {"A_LIMIT_REMOTE_START_WE", 0, MSGSRV_A_LIMIT_REMOTE_START_WE}, - {"A_LIMIT_REMOTE_END_WE", 0, MSGSRV_A_LIMIT_REMOTE_END_WE}, - {"A_PRODUCT_VERSION", 0, MSGSRV_A_PRODUCT_VERSION}, - {"A_PROXY_LIST", 0, MSGSRV_A_PROXY_LIST}, - {"A_MAXIMUM_ITEMS", 0, MSGSRV_A_MAXIMUM_ITEMS}, - {"A_TIME_INTERVAL", 0, MSGSRV_A_TIME_INTERVAL}, - {"A_RELAYHOST", 0, MSGSRV_A_RELAYHOST}, - {"A_ALIAS_OPTIONS", 0, MSGSRV_A_ALIAS_OPTIONS}, - {"A_LDAP_OPTIONS", 0, MSGSRV_A_LDAP_OPTIONS}, - {"A_CUSTOM_ALIAS", 0, MSGSRV_A_CUSTOM_ALIAS}, - {"A_ADVERTISING_CONFIG", 0, MSGSRV_A_ADVERTISING_CONFIG}, - {"A_LANGUAGE", 0, MSGSRV_A_LANGUAGE}, - {"A_PREFERENCES", 0, MSGSRV_A_PREFERENCES}, - {"A_QUOTA_WARNING", 0, MSGSRV_A_QUOTA_WARNING}, - {"A_QUEUE_TUNING", 0, MSGSRV_A_QUEUE_TUNING}, - {"A_TIMEOUT", 0, MSGSRV_A_TIMEOUT}, - {"A_PRIVACY", 0, MSGSRV_A_PRIVACY}, - {"A_THREAD_LIMIT", 0, MSGSRV_A_THREAD_LIMIT}, - {"A_DBF_PAGESIZE", 0, MSGSRV_A_DBF_PAGESIZE}, - {"A_DBF_KEYSIZE", 0, MSGSRV_A_DBF_KEYSIZE}, - {"A_ADDRESSBOOK_CONFIG", 0, MSGSRV_A_ADDRESSBOOK_CONFIG}, - {"A_ADDRESSBOOK_URL_SYSTEM", 0, MSGSRV_A_ADDRESSBOOK_URL_SYSTEM}, - {"A_ADDRESSBOOK_URL_PUBLIC", 0, MSGSRV_A_ADDRESSBOOK_URL_PUBLIC}, - {"A_ADDRESSBOOK", 0, MSGSRV_A_ADDRESSBOOK}, - {"A_SERVER_STANDALONE", 0, MSGSRV_A_SERVER_STANDALONE}, - {"A_FORWARD_UNDELIVERABLE", 0, MSGSRV_A_FORWARD_UNDELIVERABLE}, - {"A_PHRASE", 0, MSGSRV_A_PHRASE}, - {"A_ACCOUNTING_ENABLED", 0, MSGSRV_A_ACCOUNTING_ENABLED}, - {"A_ACCOUNTING_DATA", 0, MSGSRV_A_ACCOUNTING_DATA}, - {"A_BILLING_DATA", 0, MSGSRV_A_BILLING_DATA}, - {"A_BLOCKED_ADDRESS", 0, MSGSRV_A_BLOCKED_ADDRESS}, - {"A_ALLOWED_ADDRESS", 0, MSGSRV_A_ALLOWED_ADDRESS}, - {"A_RECIPIENT_LIMIT", 0, MSGSRV_A_RECIPIENT_LIMIT}, - {"A_RBL_HOST", 0, MSGSRV_A_RBL_HOST}, - {"A_SIGNATURE", 0, MSGSRV_A_SIGNATURE}, - {"A_CONNMGR", 0, MSGSRV_A_CONNMGR}, - {"A_CONNMGR_CONFIG", 0, MSGSRV_A_CONNMGR_CONFIG}, - {"A_USER_DOMAIN", 0, MSGSRV_A_USER_DOMAIN}, - {"A_RTS_ANTISPAM_CONFIG", 0, MSGSRV_A_RTS_ANTISPAM_CONFIG}, - {"A_SPOOL_DIRECTORY", 0, MSGSRV_A_SPOOL_DIRECTORY}, - {"A_SCMS_DIRECTORY", 0, MSGSRV_A_SCMS_DIRECTORY}, - {"A_DBF_DIRECTORY", 0, MSGSRV_A_DBF_DIRECTORY}, - {"A_NLS_DIRECTORY", 0, MSGSRV_A_NLS_DIRECTORY}, - {"A_BIN_DIRECTORY", 0, MSGSRV_A_BIN_DIRECTORY}, - {"A_LIB_DIRECTORY", 0, MSGSRV_A_LIB_DIRECTORY}, - {"A_DEFAULT_CHARSET", 0, MSGSRV_A_DEFAULT_CHARSET}, - {"A_RULE", 0, MSGSRV_A_RULE}, - {"A_RELAY_DOMAIN", 0, MSGSRV_A_RELAY_DOMAIN}, - {"A_LIST_DIGESTTIME", 0, MSGSRV_A_LIST_DIGESTTIME}, - {"A_LIST_ABSTRACT", 0, MSGSRV_A_LIST_ABSTRACT}, - {"A_LIST_DESCRIPTION", 0, MSGSRV_A_LIST_DESCRIPTION}, - {"A_LIST_CONFIGURATION", 0, MSGSRV_A_LIST_CONFIGURATION}, - {"A_LIST_STORE", 0, MSGSRV_A_LIST_STORE}, - {"A_LIST_NMAPSTORE", 0, MSGSRV_A_LIST_NMAPSTORE}, - {"A_LIST_MODERATOR", 0, MSGSRV_A_LIST_MODERATOR}, - {"A_LIST_OWNER", 0, MSGSRV_A_LIST_OWNER}, - {"A_LIST_SIGNATURE", 0, MSGSRV_A_LIST_SIGNATURE}, - {"A_LIST_SIGNATURE_HTML", 0, MSGSRV_A_LIST_SIGNATURE_HTML}, - {"A_LIST_DIGEST_VERSION", 0, MSGSRV_A_LIST_DIGEST_VERSION}, - {"A_LIST_MEMBERS", 0, MSGSRV_A_LIST_MEMBERS}, - {"A_LISTUSER_OPTIONS", 0, MSGSRV_A_LISTUSER_OPTIONS}, - {"A_LISTUSER_ADMINOPTIONS", 0, MSGSRV_A_LISTUSER_ADMINOPTIONS}, - {"A_LISTUSER_PASSWORD", 0, MSGSRV_A_LISTUSER_PASSWORD}, - {"A_FEATURE_SET", 0, MSGSRV_A_FEATURE_SET}, - {"A_PRIVATE_KEY_LOCATION", 0, MSGSRV_A_PRIVATE_KEY_LOCATION}, - {"A_CERTIFICATE_LOCATION", 0, MSGSRV_A_CERTIFICATE_LOCATION}, - {"A_CONFIG_CHANGED", 0, MSGSRV_A_CONFIG_CHANGED}, - {"A_LISTSERVER_NAME", 0, MSGSRV_A_LISTSERVER_NAME}, - {"A_LIST_WELCOME_MESSAGE", 0, MSGSRV_A_LIST_WELCOME_MESSAGE}, - {"A_PARENT_OBJECT", 0, MSGSRV_A_PARENT_OBJECT}, - {"A_FEATURE_INHERITANCE", 0, MSGSRV_A_FEATURE_INHERITANCE}, - {"A_TEMPLATE", 0, MSGSRV_A_TEMPLATE}, - {"A_TIMEZONE", 0, MSGSRV_A_TIMEZONE}, - {"A_LOCALE", 0, MSGSRV_A_LOCALE}, - {"A_PASSWORD_CONFIGURATION", 0, MSGSRV_A_PASSWORD_CONFIGURATION}, - {"A_TITLE", 0, MSGSRV_A_TITLE}, - {"A_DEFAULT_TEMPLATE", 0, MSGSRV_A_DEFAULT_TEMPLATE}, - {"A_TOM_MANAGER", 0, MSGSRV_A_TOM_MANAGER}, - {"A_TOM_CONTEXTS", 0, MSGSRV_A_TOM_CONTEXTS}, - {"A_TOM_DOMAINS", 0, MSGSRV_A_TOM_DOMAINS}, - {"A_TOM_OPTIONS", 0, MSGSRV_A_TOM_OPTIONS}, - {"A_DESCRIPTION", 0, MSGSRV_A_DESCRIPTION}, - {"A_STATSERVER_1", 0, MSGSRV_A_STATSERVER_1}, - {"A_STATSERVER_2", 0, MSGSRV_A_STATSERVER_2}, - {"A_STATSERVER_3", 0, MSGSRV_A_STATSERVER_3}, - {"A_STATSERVER_4", 0, MSGSRV_A_STATSERVER_4}, - {"A_STATSERVER_5", 0, MSGSRV_A_STATSERVER_5}, - {"A_STATSERVER_6", 0, MSGSRV_A_STATSERVER_6}, - {"A_NEWS", 0, MSGSRV_A_NEWS}, - {"A_MANAGER", 0, MSGSRV_A_MANAGER}, - {"A_AVAILABLE_SHARES", 0, MSGSRV_A_AVAILABLE_SHARES}, - {"A_OWNED_SHARES", 0, MSGSRV_A_OWNED_SHARES}, - {"A_NEW_SHARE_MESSAGE", 0, MSGSRV_A_NEW_SHARE_MESSAGE}, - {"A_AVAILABLE_PROXIES", 0, MSGSRV_A_AVAILABLE_PROXIES}, - {"A_OWNED_PROXIES", 0, MSGSRV_A_OWNED_PROXIES}, - {"A_RESOURCE_MANAGER", 0, MSGSRV_A_RESOURCE_MANAGER}, - {"A_BONGO_MESSAGING_SERVER", 0, MSGSRV_A_BONGO_MESSAGING_SERVER}, - {"A_ACL", 0, MSGSRV_A_ACL}, - {"A_WA_DEFAULT_TEMPLATE", 0, MSGSRV_A_WA_DEFAULT_TEMPLATE}, - {"A_WA_ALLOWED_TEMPLATES", 0, MSGSRV_A_WA_ALLOWED_TEMPLATES}, - {"A_WA_DISALLOWED_TEMPLATES", 0, MSGSRV_A_WA_DISALLOWED_TEMPLATES}, - {"A_SMS_AUTHORIZED_PHONES", 0, MSGSRV_A_SMS_AUTHORIZED_PHONES}, - {"A_CALCMD_ADDRESS_SUFFIX", 0, MSGSRV_A_CALCMD_ADDRESS_SUFFIX}, - {"A_MAX_LOAD", 0, MSGSRV_A_MAX_LOAD}, - {"A_ACL_ENABLED", 0, MSGSRV_A_ACL_ENABLED}, - {"A_UBE_SMTP_AFTER_POP", 0, MSGSRV_A_UBE_SMTP_AFTER_POP}, - {"A_UBE_REMOTE_AUTH_ONLY", 0, MSGSRV_A_UBE_REMOTE_AUTH_ONLY}, - {"A_MAX_FLOOD_COUNT", 0, MSGSRV_A_MAX_FLOOD_COUNT}, - {"A_MAX_NULL_SENDER_RECIPS", 0, MSGSRV_A_MAX_NULL_SENDER_RECIPS}, - {"A_MAX_MX_SERVERS", 0, MSGSRV_A_MAX_MX_SERVERS}, - {"A_RELAY_LOCAL_MAIL", 0, MSGSRV_A_RELAY_LOCAL_MAIL}, - {"A_CLUSTERED", 0, MSGSRV_A_CLUSTERED}, - {"A_FORCE_BIND", 0, MSGSRV_A_FORCE_BIND}, - {"A_SSL_TLS", 0, MSGSRV_A_SSL_TLS}, - {"A_SSL_ALLOW_CHAINED", 0, MSGSRV_A_SSL_ALLOW_CHAINED}, - {"A_BOUNCE_RETURN", 0, MSGSRV_A_BOUNCE_RETURN}, - {"A_BOUNCE_CC_POSTMASTER", 0, MSGSRV_A_BOUNCE_CC_POSTMASTER}, - {"A_QUOTA_USER", 0, MSGSRV_A_QUOTA_USER}, - {"A_QUOTA_SYSTEM", 0, MSGSRV_A_QUOTA_SYSTEM}, - {"A_REGISTER_QUEUE", 0, MSGSRV_A_REGISTER_QUEUE}, - {"A_QUEUE_LIMIT_BOUNCES", 0, MSGSRV_A_QUEUE_LIMIT_BOUNCES}, - {"A_LIMIT_BOUNCE_ENTRIES", 0, MSGSRV_A_LIMIT_BOUNCE_ENTRIES}, - {"A_LIMIT_BOUNCE_INTERVAL", 0, MSGSRV_A_LIMIT_BOUNCE_INTERVAL}, - {"A_DOMAIN_ROUTING", 0, MSGSRV_A_DOMAIN_ROUTING}, - {"A_MONITOR_INTERVAL", 0, MSGSRV_A_MONITOR_INTERVAL}, - {"A_MANAGER_PORT", 0, MSGSRV_A_MANAGER_PORT}, - {"A_MANAGER_SSL_PORT", 0, MSGSRV_A_MANAGER_SSL_PORT}, - {NULL, 0, NULL} -}; diff --git a/src/libs/python/libbongo/msgapi.c b/src/libs/python/libbongo/msgapi.c index c06a293..e81813c 100644 --- a/src/libs/python/libbongo/msgapi.c +++ b/src/libs/python/libbongo/msgapi.c @@ -324,7 +324,6 @@ PyMethodDef MsgApiMethods[] = { {"IcsSubscribe", msgapi_IcsSubscribe, METH_VARARGS | METH_STATIC, IcsSubscribe_doc}, {"IcsImport", msgapi_IcsImport, METH_VARARGS | METH_STATIC, IcsImport_doc}, {"NmapChallenge", msgapi_NmapChallenge, METH_VARARGS | METH_STATIC, NmapChallenge_doc}, - {"GetConfigProperty", msgapi_GetConfigProperty, METH_VARARGS | METH_STATIC, GetConfigProperty_doc}, {"GetUnprivilegedUser", msgapi_GetUnprivilegedUser, METH_VARARGS | METH_STATIC, GetUnprivilegedUser_doc}, {"GetBuildVersion", msgapi_GetBuildVersion, METH_VARARGS | METH_STATIC, GetBuildVersion_doc}, {"GetAvailableVersion", msgapi_GetAvailableVersion, METH_VARARGS | METH_STATIC, GetAvailableVersion_doc},