New upstream release 0.7.17
This commit is contained in:
Jakub Hrozek
parent
7a4345c7ff
commit
27479223a1
1
.gitignore
vendored
1
.gitignore
vendored
@ -26,3 +26,4 @@ nss-pam-ldapd-0.7.7.tar.gz.sig
|
||||
/nss-pam-ldapd-0.7.15.tar.gz.sig
|
||||
/nss-pam-ldapd-0.7.16.tar.gz
|
||||
/nss-pam-ldapd-0.7.16.tar.gz.sig
|
||||
/nss-pam-ldapd-0.7.17.tar.gz
|
||||
|
||||
@ -1,46 +1,7 @@
|
||||
diff -up nss-pam-ldapd-0.7.15/common/tio.c.epipe nss-pam-ldapd-0.7.15/common/tio.c
|
||||
--- nss-pam-ldapd-0.7.15/common/tio.c.epipe 2010-09-24 09:07:17.000000000 +0200
|
||||
+++ nss-pam-ldapd-0.7.15/common/tio.c 2012-03-15 12:21:06.776678846 +0100
|
||||
@@ -2,7 +2,7 @@
|
||||
tio.c - 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, 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
|
||||
@@ -34,6 +34,7 @@
|
||||
#include <string.h>
|
||||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
+#include <limits.h>
|
||||
|
||||
#include "tio.h"
|
||||
|
||||
@@ -229,6 +230,7 @@ int tio_read(TFILE *fp, void *buf, size_
|
||||
int rv;
|
||||
uint8_t *tmp;
|
||||
size_t newsz;
|
||||
+ size_t len;
|
||||
/* have a more convenient storage type for the buffer */
|
||||
uint8_t *ptr=(uint8_t *)buf;
|
||||
/* build a time by which we should be finished */
|
||||
@@ -293,7 +295,12 @@ int tio_read(TFILE *fp, void *buf, size_
|
||||
if (tio_select(fp,1,&deadline))
|
||||
return -1;
|
||||
/* read the input in the buffer */
|
||||
- rv=read(fp->fd,fp->readbuffer.buffer+fp->readbuffer.start,fp->readbuffer.size-fp->readbuffer.start);
|
||||
+ len=fp->readbuffer.size-fp->readbuffer.start;
|
||||
+#ifdef SSIZE_MAX
|
||||
+ if (len>SSIZE_MAX)
|
||||
+ len=SSIZE_MAX;
|
||||
+#endif /* SSIZE_MAX */
|
||||
+ rv=read(fp->fd,fp->readbuffer.buffer+fp->readbuffer.start,len);
|
||||
/* check for errors */
|
||||
if ((rv==0)||((rv<0)&&(errno!=EINTR)&&(errno!=EAGAIN)))
|
||||
return -1; /* something went wrong with the read */
|
||||
@@ -305,10 +312,39 @@ int tio_read(TFILE *fp, void *buf, size_
|
||||
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_
|
||||
}
|
||||
}
|
||||
|
||||
@ -82,9 +43,9 @@ diff -up nss-pam-ldapd-0.7.15/common/tio.c.epipe nss-pam-ldapd-0.7.15/common/tio
|
||||
}
|
||||
|
||||
/* the caller has assured us that we can write to the file descriptor
|
||||
diff -up nss-pam-ldapd-0.7.15/common/tio.h.epipe nss-pam-ldapd-0.7.15/common/tio.h
|
||||
--- nss-pam-ldapd-0.7.15/common/tio.h.epipe 2010-09-24 09:07:17.000000000 +0200
|
||||
+++ nss-pam-ldapd-0.7.15/common/tio.h 2012-03-15 12:21:06.776678846 +0100
|
||||
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.
|
||||
@ -105,9 +66,9 @@ diff -up nss-pam-ldapd-0.7.15/common/tio.h.epipe nss-pam-ldapd-0.7.15/common/tio
|
||||
int tio_skip(TFILE *fp,size_t count);
|
||||
|
||||
/* Write the specified buffer to the stream. */
|
||||
diff -up nss-pam-ldapd-0.7.15/nss/common.h.epipe nss-pam-ldapd-0.7.15/nss/common.h
|
||||
--- nss-pam-ldapd-0.7.15/nss/common.h.epipe 2010-09-24 09:07:18.000000000 +0200
|
||||
+++ nss-pam-ldapd-0.7.15/nss/common.h 2012-03-15 12:21:41.347451558 +0100
|
||||
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
|
||||
|
||||
@ -129,15 +90,7 @@ diff -up nss-pam-ldapd-0.7.15/nss/common.h.epipe nss-pam-ldapd-0.7.15/nss/common
|
||||
return retv;
|
||||
|
||||
/* This macro can be used to generate a get..byname() function
|
||||
@@ -177,13 +179,14 @@
|
||||
fp=NULL; /* file should be closed by now */ \
|
||||
return retv;
|
||||
|
||||
-/* This macro generates a endent() function body. This just closes
|
||||
+/* This macro generates an endent() function body. This just closes
|
||||
the stream. */
|
||||
#define NSS_ENDENT(fp) \
|
||||
if (!_nss_ldap_enablelookups) \
|
||||
@@ -123,6 +125,7 @@
|
||||
return NSS_STATUS_UNAVAIL; \
|
||||
if (fp!=NULL) \
|
||||
{ \
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -up ./nslcd/common.c.overflow ./nslcd/common.c
|
||||
--- ./nslcd/common.c.overflow 2012-04-28 21:23:54.000000000 +0200
|
||||
+++ ./nslcd/common.c 2012-04-28 21:38:03.263642985 +0200
|
||||
diff -up nss-pam-ldapd-0.7.17/nslcd/common.c.overflow nss-pam-ldapd-0.7.17/nslcd/common.c
|
||||
--- nss-pam-ldapd-0.7.17/nslcd/common.c.overflow 2012-09-09 19:51:44.254856507 +0200
|
||||
+++ nss-pam-ldapd-0.7.17/nslcd/common.c 2012-09-09 19:52:32.602252083 +0200
|
||||
@@ -148,19 +148,25 @@ int read_address(TFILE *fp,char *addr,in
|
||||
return 0;
|
||||
}
|
||||
@ -36,18 +36,10 @@ diff -up ./nslcd/common.c.overflow ./nslcd/common.c
|
||||
+ return (uint32_t) val;
|
||||
}
|
||||
-#endif /* WANT_STRTOUI */
|
||||
diff -up ./nslcd/common.h.overflow ./nslcd/common.h
|
||||
--- ./nslcd/common.h.overflow 2012-04-28 21:39:08.670229101 +0200
|
||||
+++ ./nslcd/common.h 2012-04-28 21:40:24.234750320 +0200
|
||||
@@ -25,6 +25,7 @@
|
||||
#define NSLCD__COMMON_H 1
|
||||
|
||||
#include <errno.h>
|
||||
+#include <stdint.h>
|
||||
|
||||
#include "nslcd.h"
|
||||
#include "common/nslcd-prot.h"
|
||||
@@ -94,31 +95,9 @@ MYLDAP_ENTRY *uid2entry(MYLDAP_SESSION *
|
||||
diff -up nss-pam-ldapd-0.7.17/nslcd/common.h.overflow nss-pam-ldapd-0.7.17/nslcd/common.h
|
||||
--- nss-pam-ldapd-0.7.17/nslcd/common.h.overflow 2012-09-09 19:51:49.826786849 +0200
|
||||
+++ nss-pam-ldapd-0.7.17/nslcd/common.h 2012-09-09 19:52:53.669988699 +0200
|
||||
@@ -98,31 +98,9 @@ MYLDAP_ENTRY *uid2entry(MYLDAP_SESSION *
|
||||
/* transforms the uid into a DN by doing an LDAP lookup */
|
||||
MUST_USE char *uid2dn(MYLDAP_SESSION *session,const char *uid,char *buf,size_t buflen);
|
||||
|
||||
|
||||
@ -13,8 +13,8 @@
|
||||
%endif
|
||||
|
||||
Name: nss-pam-ldapd
|
||||
Version: 0.7.16
|
||||
Release: 5%{?dist}
|
||||
Version: 0.7.17
|
||||
Release: 1%{?dist}
|
||||
Summary: An nsswitch module which uses directory servers
|
||||
Group: System Environment/Base
|
||||
License: LGPLv2+
|
||||
@ -270,6 +270,9 @@ exit 0
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Sun Sep 09 2012 Jakub Hrozek <jhrozek@redhat.com> 0.7.17-1
|
||||
- new upstream release 0.7.17
|
||||
|
||||
* Sun Aug 05 2012 Jakub Hrozek <jhrozek@redhat.com> - 0.7.16-5
|
||||
- Obsolete PADL's nss_ldap
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user