summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorSamba Release Account <samba-bugs@samba.org>1997-05-27 20:28:45 +0000
committerSamba Release Account <samba-bugs@samba.org>1997-05-27 20:28:45 +0000
commitccf4314fe73fb035f6941f00ce952ba3a308c2da (patch)
tree0f511263cd97ae0774877347cf5667d5b23dbe8e /source3/lib
parent36693ec1100ffc00d534b20aaae401ea8cbd77c7 (diff)
downloadsamba-ccf4314fe73fb035f6941f00ce952ba3a308c2da.tar.gz
samba-ccf4314fe73fb035f6941f00ce952ba3a308c2da.tar.bz2
samba-ccf4314fe73fb035f6941f00ce952ba3a308c2da.zip
loadparm.c: Ensure printer services cannot be read only and don't use share mode locking.
locking.c: Changed aborts to returns so not so drastic on PANIC errors. proto.h: Removed definition of open_file as this is now never externally called. reply.c: Changed reply_mknew, reply_ctemp, reply_printopen to go through open_file_shared. server.c: Modified open_file_shared to be more robust and be useful for printer & temp files. Removed truncate option from open_file (now all truncates are done in open_file_shared). util.c: Added EAGAIN to errors checked in open_socket_out(). version.h: Updated to 1.9.17alpha2. jallison@whistle.com (This used to be commit d8471909b79fd591be2b789485b65d2e636d4745)
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/util.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 0ed08405ba..831d7d64e0 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -2905,7 +2905,9 @@ int open_socket_out(int type, struct in_addr *addr, int port ,int timeout)
connect_again:
ret = connect(res,(struct sockaddr *)&sock_out,sizeof(sock_out));
- if (ret < 0 && (errno == EINPROGRESS || errno == EALREADY) && loops--) {
+ /* Some systems return EAGAIN when they mean EINPROGRESS */
+ if (ret < 0 && (errno == EINPROGRESS || errno == EALREADY ||
+ errno == EAGAIN) && loops--) {
msleep(connect_loop);
goto connect_again;
}