Changeset 177

Timestamp:

28/04/07 16:11:05 (19 months ago)

Author:

smoku

Message:

Removed HAVE_IDN checks. libidn is required. Closes #27

Location:

trunk

Files:

• c2s/authreg.c (modified) (9 diffs)
• c2s/main.c (modified) (2 diffs)
• configure.in (modified) (1 diff)
• sm/main.c (modified) (2 diffs)
• sm/mod_amp.c (modified) (1 diff)
• util/jid.c (modified) (5 diffs)

trunk/c2s/authreg.c

@@ -21 +21 @@
 #include "c2s.h"
 
-#ifdef HAVE_IDN
 #include <stringprep.h>
-#endif
 
 /* authreg module manager */
@@ -200 +198 @@
 
     snprintf(username, 1024, "%.*s", NAD_CDATA_L(nad, elem), NAD_CDATA(nad, elem));
-#ifdef HAVE_IDN
     if(stringprep_xmpp_nodeprep(username, 1024) != 0) {
         log_debug(ZONE, "auth get username failed nodeprep, bouncing it");
@@ -206 +203 @@
         return;
     }
-#endif
 
     ar_mechs = c2s->ar_mechanisms;
@@ -300 +296 @@
 
     snprintf(username, 1024, "%.*s", NAD_CDATA_L(nad, elem), NAD_CDATA(nad, elem));
-#ifdef HAVE_IDN
     if(stringprep_xmpp_nodeprep(username, 1024) != 0) {
         log_debug(ZONE, "auth set username failed nodeprep, bouncing it");
@@ -306 +301 @@
         return;
     }
-#endif
 
     /* make sure we have the resource */
@@ -320 +314 @@
 
     snprintf(resource, 1024, "%.*s", NAD_CDATA_L(nad, elem), NAD_CDATA(nad, elem));
-#ifdef HAVE_IDN
     if(stringprep_xmpp_resourceprep(resource, 1024) != 0) {
         log_debug(ZONE, "auth set resource failed resourceprep, bouncing it");
@@ -326 +319 @@
         return;
     }
-#endif
 
     ar_mechs = c2s->ar_mechanisms;
@@ -580 +572 @@
 
     snprintf(username, 1024, "%.*s", NAD_CDATA_L(nad, elem), NAD_CDATA(nad, elem));
-#ifdef HAVE_IDN
     if(stringprep_xmpp_nodeprep(username, 1024) != 0) {
         log_debug(ZONE, "register set username failed nodeprep, bouncing it");
@@ -586 +577 @@
         return;
     }
-#endif
 
     elem = nad_find_elem(nad, 1, ns, "password", 1);

trunk/c2s/main.c

@@ -21 +21 @@
 #include "c2s.h"
 
-#ifdef HAVE_IDN
 #include <stringprep.h>
-#endif
 
 static sig_atomic_t c2s_shutdown = 0;
@@ -592 +590 @@
         strncpy(id, elem->values[i], 1024);
         id[1023] = '\0';
-#ifdef HAVE_IDN
         if (stringprep_nameprep(id, 1024) != 0) {
             log_write(c2s->log, LOG_ERR, "cannot stringprep id %s, aborting", id);
             exit(1);
         }
-#endif
 
         host->realm = (realm != NULL) ? realm : pstrdup(xhash_pool(c2s->hosts), id);

trunk/configure.in

@@ -274 +274 @@
         AC_MSG_ERROR([Libidn >= 0.3.0 not found])
     fi
-
-    AC_DEFINE(HAVE_IDN,1,[Define to 1 if Libidn is available.])
 fi
 

trunk/sm/main.c

@@ -20 +20 @@
 
 #include "sm.h"
-
-#ifdef HAVE_IDN
-  #include <stringprep.h>
-#endif
+#include <stringprep.h>
 
 /** @file sm/main.c
@@ -252 +249 @@
     strncpy(id, sm->id, 1024);
     id[sizeof(id)-1] = '\0';
-#ifdef HAVE_IDN
     if (stringprep_nameprep(id, 1024) != 0) {
         log_write(sm->log, LOG_ERR, "cannot stringprep id %s, aborting", sm->id);
         exit(1);
     }
-#endif
     sm->id = id;
 

trunk/sm/mod_amp.c

@@ -23 +23 @@
 #include "sm.h"
 #include "util/util.h"
-#ifdef HAVE_IDN
 #include <stringprep.h>
-#endif
 
 /** @file sm/mod_amp.c

trunk/util/jid.c

@@ -20 +20 @@
 
 #include "util.h"
-
-#ifdef HAVE_IDN
 #include <stringprep.h>
-#endif
 
 /** Forward declaration **/
@@ -30 +27 @@
 /** preparation cache */
 prep_cache_t prep_cache_new(void) {
-#ifdef HAVE_IDN
     prep_cache_t pc;
 
@@ -41 +37 @@
 
     return pc;
-#else
-    return NULL;
-#endif
 }
 
 void prep_cache_free(prep_cache_t pc) {
-#ifdef HAVE_IDN
     xhash_free(pc->node);
     xhash_free(pc->domain);
     xhash_free(pc->resource);
     free(pc);
-#endif
 }
 
@@ -81 +72 @@
 /** do stringprep on the pieces */
 static int jid_prep_pieces(prep_cache_t pc, char *node, char *domain, char *resource) {
-#ifdef HAVE_IDN
     char str[1024], *prep;
 
@@ -138 +128 @@
     }
 
-#endif
     return 0;
 }