Changeset: e3e3d12993a9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e3e3d12993a9
Modified Files:
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (15 lines):
diff -r 987b1a26e472 -r e3e3d12993a9 clients/src/mapilib/Mapi.mx
--- a/clients/src/mapilib/Mapi.mx Tue Jul 27 08:58:03 2010 +0200
+++ b/clients/src/mapilib/Mapi.mx Tue Jul 27 11:19:28 2010 +0200
@@ -2339,10 +2339,9 @@
#ifdef HAVE_SYS_UN_H
if (mid->hostname == NULL) {
struct stat st;
- struct sockaddr_un s; /* just for sizeof(s.sun_path) */
snprintf(errbuf, sizeof(errbuf),
CLIENTS_PREFIX "/var/MonetDB5/dbfarm/mapi_socket");
- if (strlen(errbuf) <= sizeof(s.sun_path) &&
+ if (strlen(errbuf) <= sizeof(((struct sockaddr_un *)
0)->sun_path) &&
stat(errbuf, &st) != 1 &&
S_ISSOCK(st.st_mode))
mid->hostname = strdup(errbuf);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
