aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal Walfield <[email protected]>2002-11-21 03:50:23 +0000
committerNeal Walfield <[email protected]>2002-11-21 03:50:23 +0000
commit894928230ef8ee8a6f3f6bba1db2fcd0d278d6d6 (patch)
treeeed12547b9590fe6783d7b8b2c4ef614d1f94577
parent2002-11-20 Neal H. Walfield <[email protected]> (diff)
downloadlibassuan-894928230ef8ee8a6f3f6bba1db2fcd0d278d6d6.tar.gz
libassuan-894928230ef8ee8a6f3f6bba1db2fcd0d278d6d6.zip
2002-11-20 Neal H. Walfield <[email protected]>
* assuan-socket-connect.c (assuan_socket_connect): Pass PF_LOCAL to socket(), not AF_UNIX: it expects a PF_* macro and the former is more portable. (assuan_socket_connect): Use AF_LOCAL, not AF_UNIX which is more POSIXy.
-rw-r--r--src/ChangeLog8
-rw-r--r--src/assuan-socket-connect.c4
2 files changed, 10 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ebf1764..4bb8434 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,13 @@
2002-11-20 Neal H. Walfield <[email protected]>
+ * assuan-socket-connect.c (assuan_socket_connect): Pass PF_LOCAL
+ to socket(), not AF_UNIX: it expects a PF_* macro and the former
+ is more portable.
+ (assuan_socket_connect): Use AF_LOCAL, not AF_UNIX which is more
+ POSIXy.
+
+2002-11-20 Neal H. Walfield <[email protected]>
+
* assuan-defs.h (struct assuan_io): New structure.
(struct assuan_context_s): New field, io.
(_assuan_read): Depreciated.
diff --git a/src/assuan-socket-connect.c b/src/assuan-socket-connect.c
index c27c351..f6c5cae 100644
--- a/src/assuan-socket-connect.c
+++ b/src/assuan-socket-connect.c
@@ -117,7 +117,7 @@ assuan_socket_connect (ASSUAN_CONTEXT *r_ctx,
ctx->deinit_handler = do_deinit;
ctx->finish_handler = do_finish;
- fd = socket (AF_UNIX, SOCK_STREAM, 0);
+ fd = socket (PF_LOCAL, SOCK_STREAM, 0);
if (fd == -1)
{
LOGERROR1 ("can't create socket: %s\n", strerror (errno));
@@ -126,7 +126,7 @@ assuan_socket_connect (ASSUAN_CONTEXT *r_ctx,
}
memset (&srvr_addr, 0, sizeof srvr_addr );
- srvr_addr.sun_family = AF_UNIX;
+ srvr_addr.sun_family = AF_LOCAL;
strcpy (srvr_addr.sun_path, name);
len = (offsetof (struct sockaddr_un, sun_path)
+ strlen (srvr_addr.sun_path) + 1);