* Use syslog-compatible logging levels in lprintf(); the loglevel chosen

[citadel.git] / citadel / domain.c

diff --git a/citadel/domain.c b/citadel/domain.c
index 1c43ef513671818696968547ef0b003d64763cc0..8af3bc37b573c699f43b941e0ac62e277507d0b5 100644 (file)
--- a/citadel/domain.c
+++ b/citadel/domain.c
@@ -14,6 +14,9 @@
 
 #ifdef HAVE_RESOLV_H
 #include <arpa/nameser.h>
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
 #include <resolv.h>
 #endif
 
@@ -64,7 +67,13 @@ int get_hosts(char *mxbuf, char *rectype) {
  * number listed in the MX record.  If they're identical, randomize the
  * result.
  */
-inline int mx_compare_pref(int pref1, int pref2) {
+int mx_compare_pref(const void *mx1, const void *mx2) {
+       int pref1;
+       int pref2;
+
+       pref1 = ((const struct mx *)mx1)->pref;
+       pref2 = ((const struct mx *)mx2)->pref;
+
        if (pref1 > pref2) {
                return(1);
        }
@@ -77,33 +86,6 @@ inline int mx_compare_pref(int pref1, int pref2) {
 }
 
 
-/*
- * sort_mxrecs()
- *
- * Sort a pile of MX records (struct mx, definted in domain.h) by preference
- *
- */
-void sort_mxrecs(struct mx *mxrecs, int num_mxrecs) {
-       int a, b;
-       struct mx hold1, hold2;
-
-       if (num_mxrecs < 2) return;
-
-       /* do the sort */
-       for (a = num_mxrecs - 2; a >= 0; --a) {
-               for (b = 0; b <= a; ++b) {
-                       if (mx_compare_pref(mxrecs[b].pref,mxrecs[b+1].pref)) {
-                               memcpy(&hold1, &mxrecs[b], sizeof(struct mx));
-                               memcpy(&hold2, &mxrecs[b+1], sizeof(struct mx));
-                               memcpy(&mxrecs[b], &hold2, sizeof(struct mx));
-                               memcpy(&mxrecs[b+1], &hold1, sizeof(struct mx));
-                       }
-               }
-       }
-}
-
-
-
 /* 
  * getmx()
  *
@@ -186,7 +168,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);
                        }
                }
@@ -237,7 +219,10 @@ int getmx(char *mxbuf, char *dest) {
        }
 #endif /* HAVE_RESOLV_H */
 
-       sort_mxrecs(mxrecs, num_mxrecs);
+       /* Sort the MX records by preference */
+       if (num_mxrecs > 1) {
+               qsort(mxrecs, num_mxrecs, sizeof(struct mx), mx_compare_pref);
+       }
 
        strcpy(mxbuf, "");
        for (n=0; n<num_mxrecs; ++n) {