diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2014-07-30 10:30:13 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@redhat.com> | 2014-09-25 09:45:32 +0200 |
| commit | 5d1311db3679526e08e4f1e3a31e57755880dcf9 (patch) | |
| tree | fe46b2309f2c85b48eee208a41c108e41fd55c25 | |
| parent | 448fb1d17de52a7c8f2d807daa76d8d0e2700665 (diff) | |
| download | p11-kit-5d1311db3679526e08e4f1e3a31e57755880dcf9.tar.gz | |
remote: eliminated timeout from server
| -rw-r--r-- | p11-kit/remote.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/p11-kit/remote.c b/p11-kit/remote.c index 1ccb7fa..6316717 100644 --- a/p11-kit/remote.c +++ b/p11-kit/remote.c @@ -215,7 +215,6 @@ p11_kit_remote_serve_module (CK_FUNCTION_LIST *module, socklen_t sa_len; struct sockaddr_un sa; fd_set rd_set; - struct timespec ts; sigset_t emptyset, blockset; sigemptyset(&blockset); @@ -230,11 +229,13 @@ p11_kit_remote_serve_module (CK_FUNCTION_LIST *module, sa.sun_family = AF_UNIX; snprintf(sa.sun_path, sizeof(sa.sun_path), "%s", socket_file); + remove(socket_file); + sd = socket(AF_UNIX, SOCK_STREAM, 0); if (sd == -1) { e = errno; p11_message ("could not create socket %s: %s", socket_file, strerror(e)); - goto out; + return 1; } umask(066); @@ -242,7 +243,7 @@ p11_kit_remote_serve_module (CK_FUNCTION_LIST *module, if (rc == -1) { e = errno; p11_message ("could not create socket %s: %s", socket_file, strerror(e)); - goto out; + return 1; } #if 0 @@ -257,7 +258,7 @@ p11_kit_remote_serve_module (CK_FUNCTION_LIST *module, if (rc == -1) { e = errno; p11_message ("could not listen to socket %s: %s", socket_file, strerror(e)); - goto out; + return 1; } p11_buffer_init (&options, 0); @@ -273,10 +274,8 @@ p11_kit_remote_serve_module (CK_FUNCTION_LIST *module, FD_ZERO(&rd_set); FD_SET(sd, &rd_set); - ts.tv_nsec = 0; - ts.tv_sec = 30; - ret = pselect(sd + 1, &rd_set, NULL, NULL, &ts, &emptyset); + ret = pselect(sd + 1, &rd_set, NULL, NULL, NULL, &emptyset); if (ret == -1 && errno == EINTR) continue; @@ -314,7 +313,6 @@ p11_kit_remote_serve_module (CK_FUNCTION_LIST *module, close(cfd); } -out: p11_buffer_uninit (&buffer); p11_buffer_uninit (&options); |