X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fresolve.c;h=aeb98ba6e923fe913f06dc5e00e58a30d185a718;hp=367692d6c48cfdb085e379ace4d049c79863ccc9;hb=c3dfd63bf3213a5a68d890d3e7cb38fe94a55cb6;hpb=490f28ffd1b42ee2076ce89c62d0e672ee7e541e diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c index 367692d6..aeb98ba6 100644 --- a/src/ngircd/resolve.c +++ b/src/ngircd/resolve.c @@ -14,7 +14,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: resolve.c,v 1.4 2002/12/12 12:24:18 alex Exp $"; +static char UNUSED id[] = "$Id: resolve.c,v 1.6 2003/04/21 10:52:51 alex Exp $"; #include "imp.h" #include @@ -174,7 +174,7 @@ Do_ResolveAddr( struct sockaddr_in *Addr, INT w_fd ) /* Namen aufloesen */ h = gethostbyaddr( (CHAR *)&Addr->sin_addr, sizeof( Addr->sin_addr ), AF_INET ); - if( h ) strcpy( hostname, h->h_name ); + if( h ) strlcpy( hostname, h->h_name, sizeof( hostname )); else { #ifdef h_errno @@ -182,11 +182,11 @@ Do_ResolveAddr( struct sockaddr_in *Addr, INT w_fd ) #else Log_Resolver( LOG_WARNING, "Can't resolve address \"%s\"!", inet_ntoa( Addr->sin_addr )); #endif - strcpy( hostname, inet_ntoa( Addr->sin_addr )); + strlcpy( hostname, inet_ntoa( Addr->sin_addr ), sizeof( hostname )); } /* Antwort an Parent schreiben */ - if( write( w_fd, hostname, strlen( hostname ) + 1 ) != ( strlen( hostname ) + 1 )) + if( (size_t)write( w_fd, hostname, strlen( hostname ) + 1 ) != (size_t)( strlen( hostname ) + 1 )) { Log_Resolver( LOG_CRIT, "Resolver: Can't write to parent: %s!", strerror( errno )); close( w_fd ); @@ -213,7 +213,7 @@ Do_ResolveName( CHAR *Host, INT w_fd ) if( h ) { addr = (struct in_addr *)h->h_addr; - strcpy( ip, inet_ntoa( *addr )); + strlcpy( ip, inet_ntoa( *addr ), sizeof( ip )); } else { @@ -226,7 +226,7 @@ Do_ResolveName( CHAR *Host, INT w_fd ) } /* Antwort an Parent schreiben */ - if( write( w_fd, ip, strlen( ip ) + 1 ) != ( strlen( ip ) + 1 )) + if( (size_t)write( w_fd, ip, strlen( ip ) + 1 ) != (size_t)( strlen( ip ) + 1 )) { Log_Resolver( LOG_CRIT, "Resolver: Can't write to parent: %s!", strerror( errno )); close( w_fd );