[Olsr-cvs] olsrd-current/lib/nameservice/src compat.c, 1.2, 1.3 nameservice.c, 1.18, 1.19

[Bernd Petrovitsch]

Update of /cvsroot/olsrd/olsrd-current/lib/nameservice/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30354/lib/nameservice/src

Modified Files:
	compat.c nameservice.c 
Log Message:
* applied patch from John Hay

Index: nameservice.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/lib/nameservice/src/nameservice.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** nameservice.c	6 Feb 2007 21:07:11 -0000	1.18
--- nameservice.c	19 Apr 2007 22:21:34 -0000	1.19
***************
*** 188,192 ****
              my_forwarders = add_name_to_list(my_forwarders, "", NAME_FORWARDER, NULL);
              olsr_printf(1,"\nNAME PLUGIN: parameter dns-server: (main address)");
!         } else if (inet_pton(olsr_cnf->ip_version, value, &ip)) {
              my_forwarders = add_name_to_list(my_forwarders, "", NAME_FORWARDER, &ip);
              olsr_printf(1,"\nNAME PLUGIN: parameter dns-server: (%s)", value);
--- 188,192 ----
              my_forwarders = add_name_to_list(my_forwarders, "", NAME_FORWARDER, NULL);
              olsr_printf(1,"\nNAME PLUGIN: parameter dns-server: (main address)");
!         } else if (inet_pton(olsr_cnf->ip_version, value, &ip) == 1) {
              my_forwarders = add_name_to_list(my_forwarders, "", NAME_FORWARDER, &ip);
              olsr_printf(1,"\nNAME PLUGIN: parameter dns-server: (%s)", value);
***************
*** 1281,1285 ****
      
      //ip in service-line is allowed 
!     if (inet_pton(olsr_cnf->ip_version, hostname_or_ip, &olsr_ip)) {
          if (allowed_ip(&olsr_ip)) {
              olsr_printf(2, "NAME PLUGIN: ip %s in service %s is OK\n", olsr_ip_to_string(&olsr_ip), service_line);
--- 1281,1285 ----
      
      //ip in service-line is allowed 
!     if (inet_pton(olsr_cnf->ip_version, hostname_or_ip, &olsr_ip) == 1) {
          if (allowed_ip(&olsr_ip)) {
              olsr_printf(2, "NAME PLUGIN: ip %s in service %s is OK\n", olsr_ip_to_string(&olsr_ip), service_line);

Index: compat.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/lib/nameservice/src/compat.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** compat.c	2 Jun 2005 15:34:00 -0000	1.2
--- compat.c	19 Apr 2007 22:21:34 -0000	1.3
***************
*** 12,18 ****
    char *ret = NULL;
  
-   if(!len)
-     return NULL;
- 
    if(len > size)
      len = size;
--- 12,15 ----