diff -rupN /usr/src/colinux/src/colinux/os/winnt/user/conet-bridged-daemon/main.c /colinux-src/colinux/src/colinux/os/winnt/user/conet-bridged-daemon/main.c --- /usr/src/colinux/src/colinux/os/winnt/user/conet-bridged-daemon/main.c 2004-02-24 20:21:37.000000000 -0500 +++ /colinux-src/colinux/src/colinux/os/winnt/user/conet-bridged-daemon/main.c 2004-02-25 17:53:17.000000000 -0500 @@ -334,7 +334,8 @@ pcap_init() if (d == NULL) { co_debug("bridged-net-daemon: No matching adapter\n"); - goto pcap_out; + exit_code = -1; + goto pcap_out_close; } /* Open the first adapter. */ diff -rupN /usr/src/colinux/src/colinux/user/config.h /colinux-src/colinux/src/colinux/user/config.h --- /usr/src/colinux/src/colinux/user/config.h 2004-02-24 18:51:21.000000000 -0500 +++ /colinux-src/colinux/src/colinux/user/config.h 2004-02-25 16:42:27.000000000 -0500 @@ -13,8 +13,8 @@ #include #include +#include "macaddress.h" co_rc_t co_load_config(char *text, co_config_t *out_config); -co_rc_t co_parse_mac_address(const char *text, char *binary); #endif diff -rupN /usr/src/colinux/src/colinux/user/macaddress.c /colinux-src/colinux/src/colinux/user/macaddress.c --- /usr/src/colinux/src/colinux/user/macaddress.c 2004-02-24 19:31:34.000000000 -0500 +++ /colinux-src/colinux/src/colinux/user/macaddress.c 2004-02-25 17:52:49.000000000 -0500 @@ -3,7 +3,7 @@ #include "macaddress.h" -co_rc_t co_parse_mac_address(const char *text, char *binary) +co_rc_t co_parse_mac_address(const char *text, unsigned char *binary) { int ret, i; unsigned int mac[6]; @@ -15,8 +15,9 @@ co_rc_t co_parse_mac_address(const char ret = sscanf(text, "%02x:%02x:%02x:%02x:%02x:%02x", &mac[0], &mac[1], &mac[2], &mac[3], &mac[4], &mac[5]); - for (i=0; i < 6; i++) - binary[i] = (char)mac[i]; + for (i=0; i < 6; i++) { + binary[i] = (unsigned char)mac[i]; + } if (ret != 6) return CO_RC(ERROR); @@ -24,7 +25,7 @@ co_rc_t co_parse_mac_address(const char return CO_RC(OK); } -void co_build_mac_address(char *text, int ntext, const char *mac) +void co_build_mac_address(char *text, int ntext, const unsigned char *mac) { snprintf(text, ntext, "%02x:%02x:%02x:%02x:%02x:%02x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); diff -rupN /usr/src/colinux/src/colinux/user/macaddress.h /colinux-src/colinux/src/colinux/user/macaddress.h --- /usr/src/colinux/src/colinux/user/macaddress.h 2004-02-24 19:31:25.000000000 -0500 +++ /colinux-src/colinux/src/colinux/user/macaddress.h 2004-02-25 17:34:07.000000000 -0500 @@ -13,7 +13,7 @@ #include -extern co_rc_t co_parse_mac_address(const char *text, char *binary); -extern void co_build_mac_address(char *text, int ntext, const char *mac); +extern co_rc_t co_parse_mac_address(const char *text, unsigned char *binary); +extern void co_build_mac_address(char *text, int ntext, const unsigned char *mac); #endif