HUGE PATCH. This moves all of mime_parser.c and all

[citadel.git] / citadel / domain.c

diff --git a/citadel/domain.c b/citadel/domain.c
index 6e098708936cafce5d217badad11094722769cf2..da1c9bf9544020d10f4d0314435b31f55bc8222b 100644 (file)
--- a/citadel/domain.c
+++ b/citadel/domain.c
@@ -14,14 +14,16 @@
 
 #ifdef HAVE_RESOLV_H
 #include <arpa/nameser.h>
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
 #include <resolv.h>
 #endif
-
+#include <libcitadel.h>
 #include "sysdep_decls.h"
 #include "citadel.h"
 #include "domain.h"
 #include "server.h"
-#include "tools.h"
 #include "internet_addressing.h"
 
 
@@ -35,8 +37,8 @@
 int get_hosts(char *mxbuf, char *rectype) {
        int config_lines;
        int i;
-       char buf[SIZ];
-       char host[SIZ], type[SIZ];
+       char buf[256];
+       char host[256], type[256];
        int total_smarthosts = 0;
 
        if (inetcfg == NULL) return(0);
@@ -44,9 +46,9 @@ int get_hosts(char *mxbuf, char *rectype) {
 
        config_lines = num_tokens(inetcfg, '\n');
        for (i=0; i<config_lines; ++i) {
-               extract_token(buf, inetcfg, i, '\n');
-               extract_token(host, buf, 0, '|');
-               extract_token(type, buf, 1, '|');
+               extract_token(buf, inetcfg, i, '\n', sizeof buf);
+               extract_token(host, buf, 0, '|', sizeof host);
+               extract_token(type, buf, 1, '|', sizeof type);
 
                if (!strcasecmp(type, rectype)) {
                        strcat(mxbuf, host);
@@ -148,7 +150,7 @@ int getmx(char *mxbuf, char *dest) {
                C_IN, T_MX, (unsigned char *)answer.bytes, sizeof(answer)  );
 
        if (ret < 0) {
-               mxrecs = mallok(sizeof(struct mx));
+               mxrecs = malloc(sizeof(struct mx));
                mxrecs[0].pref = 0;
                strcpy(mxrecs[0].host, dest);
                num_mxrecs = 1;
@@ -165,7 +167,7 @@ int getmx(char *mxbuf, char *dest) {
        
                for (qdcount = ntohs(answer.header.qdcount); qdcount--; ptr += ret + QFIXEDSZ) {
                        if ((ret = dn_skipname(ptr, endptr)) < 0) {
-                               lprintf(9, "dn_skipname error\n");
+                               lprintf(CTDL_DEBUG, "dn_skipname error\n");
                                return(0);
                        }
                }
@@ -201,10 +203,10 @@ int getmx(char *mxbuf, char *dest) {
        
                                ++num_mxrecs;
                                if (mxrecs == NULL) {
-                                       mxrecs = mallok(sizeof(struct mx));
+                                       mxrecs = malloc(sizeof(struct mx));
                                }
                                else {
-                                       mxrecs = reallok(mxrecs,
+                                       mxrecs = realloc(mxrecs,
                                            (sizeof(struct mx) * num_mxrecs) );
                                }
        
@@ -226,6 +228,6 @@ int getmx(char *mxbuf, char *dest) {
                strcat(mxbuf, mxrecs[n].host);
                strcat(mxbuf, "|");
        }
-       phree(mxrecs);
+       free(mxrecs);
        return(num_mxrecs);
 }