More reply stuff.

[adns.git] / src / setup.c

diff --git a/src/setup.c b/src/setup.c
index 463779d5c2625d73bd0703e3c2782e6b52d9ec88..a83b97a9eafc7f89addca19af6df29c5ac3a6fd3 100644 (file)
--- a/src/setup.c
+++ b/src/setup.c
@@ -132,16 +132,16 @@ static void ccf_nameserver(adns_state ads, const char *fn, int lno, const char *
 
 static void ccf_search(adns_state ads, const char *fn, int lno, const char *buf) {
   if (!buf) return;
 
 static void ccf_search(adns_state ads, const char *fn, int lno, const char *buf) {
   if (!buf) return;

-  adns__diag(ads,-1,"warning - `search' ignored FIXME");
+  adns__diag(ads,-1,"warning - `search' ignored fixme");

 }
 
 static void ccf_sortlist(adns_state ads, const char *fn, int lno, const char *buf) {
 }
 
 static void ccf_sortlist(adns_state ads, const char *fn, int lno, const char *buf) {

-  adns__diag(ads,-1,"warning - `sortlist' ignored FIXME");
+  adns__diag(ads,-1,"warning - `sortlist' ignored fixme");

 }
 
 static void ccf_options(adns_state ads, const char *fn, int lno, const char *buf) {
   if (!buf) return;
 }
 
 static void ccf_options(adns_state ads, const char *fn, int lno, const char *buf) {
   if (!buf) return;

-  adns__diag(ads,-1,"warning - `options' ignored FIXME");
+  adns__diag(ads,-1,"warning - `options' ignored fixme");

 }
 
 static void ccf_clearnss(adns_state ads, const char *fn, int lno, const char *buf) {
 }
 
 static void ccf_clearnss(adns_state ads, const char *fn, int lno, const char *buf) {


@@ -289,16 +289,19 @@ int adns_init(adns_state *ads_r, adns_initflags flags, FILE *diagfile) {
   ads->udpsocket= socket(AF_INET,SOCK_DGRAM,proto->p_proto);
   if (ads->udpsocket<0) { r= errno; goto x_free; }
 
   ads->udpsocket= socket(AF_INET,SOCK_DGRAM,proto->p_proto);
   if (ads->udpsocket<0) { r= errno; goto x_free; }
 

-  /*fixme: nonblock */
+  r= adns__setnonblock(ads,ads->udpsocket);
+  if (r) { r= errno; goto x_closeudp; }

   
   *ads_r= ads;
   return 0;
 
   
   *ads_r= ads;
   return 0;
 

+ x_closeudp:
+  close(ads->udpsocket);

  x_free:
   free(ads);
   return r;
 }
 
 int adns_finish(adns_state ads) {
  x_free:
   free(ads);
   return r;
 }
 
 int adns_finish(adns_state ads) {

-  abort(); /* FIXME */
+  abort(); /* fixme */

 }
 }