101 lines
3.6 KiB
Diff
101 lines
3.6 KiB
Diff
diff -up nss-pam-ldapd-0.7.17/common/tio.c.epipe nss-pam-ldapd-0.7.17/common/tio.c
|
|
--- nss-pam-ldapd-0.7.17/common/tio.c.epipe 2012-09-09 19:59:27.189069033 +0200
|
|
+++ nss-pam-ldapd-0.7.17/common/tio.c 2012-09-09 20:00:34.378229054 +0200
|
|
@@ -312,10 +312,39 @@ int tio_read(TFILE *fp, void *buf, size_
|
|
}
|
|
}
|
|
|
|
-/* Read and discard the specified number of bytes from the stream. */
|
|
+/* Read and discard the specified number of bytes from the stream.
|
|
+ If count is 0 reads and discards any data that can be read and empties
|
|
+ the read buffer. */
|
|
int tio_skip(TFILE *fp, size_t count)
|
|
{
|
|
- return tio_read(fp,NULL,count);
|
|
+ int rv;
|
|
+ size_t len;
|
|
+ /* for simple cases just read */
|
|
+ if (count>0)
|
|
+ {
|
|
+ return tio_read(fp,NULL,count);
|
|
+ }
|
|
+ /* clear the read buffer */
|
|
+ fp->readbuffer.start=0;
|
|
+ fp->readbuffer.len=0;
|
|
+ fp->read_resettable=0;
|
|
+ /* read until we can't read no more */
|
|
+ len=fp->readbuffer.size;
|
|
+#ifdef SSIZE_MAX
|
|
+ if (len>SSIZE_MAX)
|
|
+ len=SSIZE_MAX;
|
|
+#endif /* SSIZE_MAX */
|
|
+ while (1)
|
|
+ {
|
|
+ rv=read(fp->fd,fp->readbuffer.buffer,len);
|
|
+ /* check for errors */
|
|
+ if (rv==0)
|
|
+ return 0; /* end-of-file */
|
|
+ if ((rv<0)&&(errno==EWOULDBLOCK))
|
|
+ return 0; /* we've ready everything we can without blocking */
|
|
+ if ((rv<0)&&(errno!=EINTR)&&(errno!=EAGAIN))
|
|
+ return -1; /* something went wrong with the read */
|
|
+ }
|
|
}
|
|
|
|
/* the caller has assured us that we can write to the file descriptor
|
|
diff -up nss-pam-ldapd-0.7.17/common/tio.h.epipe nss-pam-ldapd-0.7.17/common/tio.h
|
|
--- nss-pam-ldapd-0.7.17/common/tio.h.epipe 2012-09-09 20:00:55.145969422 +0200
|
|
+++ nss-pam-ldapd-0.7.17/common/tio.h 2012-09-09 20:01:48.294304972 +0200
|
|
@@ -2,7 +2,7 @@
|
|
tio.h - timed io functions
|
|
This file is part of the nss-pam-ldapd library.
|
|
|
|
- Copyright (C) 2007, 2008 Arthur de Jong
|
|
+ Copyright (C) 2007, 2008, 2010, 2012 Arthur de Jong
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
@@ -56,7 +56,9 @@ TFILE *tio_fdopen(int fd,struct timeval
|
|
/* Read the specified number of bytes from the stream. */
|
|
int tio_read(TFILE *fp,void *buf,size_t count);
|
|
|
|
-/* Read and discard the specified number of bytes from the stream. */
|
|
+/* Read and discard the specified number of bytes from the stream.
|
|
+ If count is 0 reads and discards any data that can be read and empties
|
|
+ the read buffer. */
|
|
int tio_skip(TFILE *fp,size_t count);
|
|
|
|
/* Write the specified buffer to the stream. */
|
|
diff -up nss-pam-ldapd-0.7.17/nss/common.h.epipe nss-pam-ldapd-0.7.17/nss/common.h
|
|
--- nss-pam-ldapd-0.7.17/nss/common.h.epipe 2012-09-09 20:02:18.855922903 +0200
|
|
+++ nss-pam-ldapd-0.7.17/nss/common.h 2012-09-09 20:03:52.188756077 +0200
|
|
@@ -2,7 +2,7 @@
|
|
common.h - common functions for NSS lookups
|
|
|
|
Copyright (C) 2006 West Consulting
|
|
- Copyright (C) 2006, 2007, 2008, 2009, 2010 Arthur de Jong
|
|
+ Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Arthur de Jong
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
@@ -97,8 +97,10 @@
|
|
READ_RESPONSE_CODE(fp); \
|
|
retv=readfn; \
|
|
/* close socket and we're done */ \
|
|
- if ((retv==NSS_STATUS_SUCCESS)||(retv==NSS_STATUS_TRYAGAIN)) \
|
|
+ if ((retv==NSS_STATUS_SUCCESS)||(retv==NSS_STATUS_TRYAGAIN)) { \
|
|
+ (void)tio_skip(fp,0); /* read any buffered data */ \
|
|
(void)tio_close(fp); \
|
|
+ } \
|
|
return retv;
|
|
|
|
/* This macro can be used to generate a get..byname() function
|
|
@@ -123,6 +125,7 @@
|
|
return NSS_STATUS_UNAVAIL; \
|
|
if (fp!=NULL) \
|
|
{ \
|
|
+ (void)tio_skip(fp,0); /* read any buffered data */ \
|
|
(void)tio_close(fp); \
|
|
fp=NULL; \
|
|
} \
|