Commit 24ee607a authored by Mark Andrews's avatar Mark Andrews
Browse files

2080. [port] libbind: res_init.c did not compile on older versions

                        of Solaris. [RT #16363]
parent 2113dfd6
2080. [port] libbind: res_init.c did not compile on older versions
of Solaris. [RT #16363]
2079. [bug] The lame cache was not handling multiple types 2079. [bug] The lame cache was not handling multiple types
correctly. [RT #16361] correctly. [RT #16361]
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
static const char sccsid[] = "@(#)res_init.c 8.1 (Berkeley) 6/7/93"; static const char sccsid[] = "@(#)res_init.c 8.1 (Berkeley) 6/7/93";
static const char rcsid[] = "$Id: res_init.c,v 1.20 2005/11/03 00:01:52 marka Exp $"; static const char rcsid[] = "$Id: res_init.c,v 1.21 2006/08/30 23:14:17 marka Exp $";
#endif /* LIBC_SCCS and not lint */ #endif /* LIBC_SCCS and not lint */
#include "port_before.h" #include "port_before.h"
...@@ -237,17 +237,10 @@ __res_vinit(res_state statp, int preinit) { ...@@ -237,17 +237,10 @@ __res_vinit(res_state statp, int preinit) {
if (buf[0] == '+') if (buf[0] == '+')
buf[0] = '.'; buf[0] = '.';
cp = strchr(buf, '.'); cp = strchr(buf, '.');
if (cp == NULL) { cp = (cp == NULL) ? buf : (cp + 1);
if (strlcpy(statp->defdname, buf, if (strlen(cp) >= sizeof(statp->defdname))
sizeof(statp->defdname))
>= sizeof(statp->defdname))
goto freedata; goto freedata;
} else { strcpy(statp->defdname, cp);
if (strlcpy(statp->defdname, cp+1,
sizeof(statp->defdname))
>= sizeof(statp->defdname))
goto freedata;
}
} }
} }
#endif /* SOLARIS2 */ #endif /* SOLARIS2 */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment