rpms/autofs/devel autofs-5.0.1-rc2-admit-slashify-colons.patch, NONE, 1.1 autofs-5.0.1-rc2-allow-underscore-in-hostname.patch, NONE, 1.1 autofs-5.0.1-rc2-set-socket-close-on-exec.patch, NONE, 1.1 autofs.spec, 1.169, 1.170
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Dec 14 04:39:48 UTC 2006
Author: ikent
Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7535
Modified Files:
autofs.spec
Added Files:
autofs-5.0.1-rc2-admit-slashify-colons.patch
autofs-5.0.1-rc2-allow-underscore-in-hostname.patch
autofs-5.0.1-rc2-set-socket-close-on-exec.patch
Log Message:
* Thu Dec 14 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc2.38
- update master map tokenizer to admit "slasify-colons" option.
- update location validation to accept "_" (bz 219445).
- set close-on-exec flag on open sockets (bz 215757).
autofs-5.0.1-rc2-admit-slashify-colons.patch:
CHANGELOG | 1 +
lib/master_tok.l | 6 ++++++
2 files changed, 7 insertions(+)
--- NEW FILE autofs-5.0.1-rc2-admit-slashify-colons.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index e42bf42..c41dc39 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -49,6 +49,7 @@
- make "-hosts" module try to be sensitive to exports list changes.
- change mount "device" from "automount" to the map name.
- check for buffer overflow in mount_afs.c.
+- update master map tokenizer to admit "slasify-colons" option (Capelle Bonoit).
1/9/2006 autofs-5.0.1 rc2
-------------------------
diff --git a/lib/master_tok.l b/lib/master_tok.l
index dc76c5c..84239c1 100644
--- a/lib/master_tok.l
+++ b/lib/master_tok.l
@@ -92,6 +92,7 @@ CONT \\\n{OPTWS}
OPTIONSTR ([\-]?([[:alpha:]_]([[:alnum:]_\-])*(=([[:alnum:]_\-])+)*)+)
MACROSTR (-D{OPTWS}([[:alpha:]_]([[:alnum:]_\-])*)=([[:alnum:]_\-])+)
+SLASHIFYSTR (--(no-)?slashify-colons)
NUMBER [0-9]+
DNSERVSTR1 ([[:alpha:]][[:alnum:]\-.]*(:[0-9]+)?:)
@@ -307,6 +308,11 @@ OPTTOUT (-t{OPTWS}|-t{OPTWS}={OPTWS}|--
{OPTWS} {}
+ {SLASHIFYSTR} {
+ strcpy(master_lval.strtype, master_text);
+ return(OPTION);
+ }
+
{MACROSTR} {
strcpy(master_lval.strtype, master_text);
return(OPTION);
autofs-5.0.1-rc2-allow-underscore-in-hostname.patch:
CHANGELOG | 1 +
modules/parse_sun.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE autofs-5.0.1-rc2-allow-underscore-in-hostname.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index c41dc39..49620d5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -50,6 +50,7 @@
- change mount "device" from "automount" to the map name.
- check for buffer overflow in mount_afs.c.
- update master map tokenizer to admit "slasify-colons" option (Capelle Bonoit).
+- update location validation to accept "_" (Fabio Olive Leite).
1/9/2006 autofs-5.0.1 rc2
-------------------------
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index 6f10a4f..c849ff3 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -691,7 +691,7 @@ static int validate_location(char *loc)
if (check_colon(ptr)) {
while (*ptr && *ptr != ':') {
if (!(isalnum(*ptr) ||
- *ptr == '-' || *ptr == '.' ||
+ *ptr == '-' || *ptr == '.' || *ptr == '_' ||
*ptr == ',' || *ptr == '(' || *ptr == ')'))
return 0;
ptr++;
autofs-5.0.1-rc2-set-socket-close-on-exec.patch:
CHANGELOG | 1 +
lib/rpc_subs.c | 22 +++++++++++++++++++---
modules/replicated.c | 9 ++++++++-
3 files changed, 28 insertions(+), 4 deletions(-)
--- NEW FILE autofs-5.0.1-rc2-set-socket-close-on-exec.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 49620d5..bf5195d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -51,6 +51,7 @@
- check for buffer overflow in mount_afs.c.
- update master map tokenizer to admit "slasify-colons" option (Capelle Bonoit).
- update location validation to accept "_" (Fabio Olive Leite).
+- set close-on-exec flag on open sockets.
1/9/2006 autofs-5.0.1 rc2
-------------------------
diff --git a/lib/rpc_subs.c b/lib/rpc_subs.c
index 4982457..b4e9c91 100644
--- a/lib/rpc_subs.c
+++ b/lib/rpc_subs.c
@@ -51,7 +51,7 @@ static char *ypdomain = NULL;
*/
static CLIENT *create_udp_client(struct conn_info *info)
{
- int fd, ret, ghn_errno;
+ int fd, cl_flags, ret, ghn_errno;
CLIENT *client;
struct sockaddr_in laddr, raddr;
struct hostent hp;
@@ -105,6 +105,12 @@ got_addr:
fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
if (fd < 0)
return NULL;
+
+ if ((cl_flags = fcntl(fd, F_GETFD, 0)) != -1) {
+ cl_flags |= FD_CLOEXEC;
+ fcntl(fd, F_SETFD, cl_flags);
+ }
+
laddr.sin_family = AF_INET;
laddr.sin_port = 0;
laddr.sin_addr.s_addr = htonl(INADDR_ANY);
@@ -255,7 +261,7 @@ done:
*/
static CLIENT *create_tcp_client(struct conn_info *info)
{
- int fd, ghn_errno;
+ int fd, cl_flags, ghn_errno;
CLIENT *client;
struct sockaddr_in addr;
struct hostent hp;
@@ -304,6 +310,11 @@ got_addr:
if (fd < 0)
return NULL;
+ if ((cl_flags = fcntl(fd, F_GETFD, 0)) != -1) {
+ cl_flags |= FD_CLOEXEC;
+ fcntl(fd, F_SETFD, cl_flags);
+ }
+
ret = connect_nb(fd, &addr, &info->timeout);
if (ret < 0)
goto out_close;
@@ -749,7 +760,7 @@ static int masked_match(const char *addr
struct sockaddr_in6 saddr6;
struct ifconf ifc;
struct ifreq *ifr;
- int sock, ret, i, is_ipv4, is_ipv6;
+ int sock, cl_flags, ret, i, is_ipv4, is_ipv6;
unsigned int msize;
sock = socket(AF_INET, SOCK_DGRAM, 0);
@@ -759,6 +770,11 @@ static int masked_match(const char *addr
return 0;
}
+ if ((cl_flags = fcntl(sock, F_GETFD, 0)) != -1) {
+ cl_flags |= FD_CLOEXEC;
+ fcntl(sock, F_SETFD, cl_flags);
+ }
+
ifc.ifc_len = sizeof(buf);
ifc.ifc_req = (struct ifreq *) buf;
ret = ioctl(sock, SIOCGIFCONF, &ifc);
diff --git a/modules/replicated.c b/modules/replicated.c
index 5aaaba1..46ea36b 100644
--- a/modules/replicated.c
+++ b/modules/replicated.c
@@ -52,6 +52,8 @@ #include <arpa/inet.h>
#include <net/if.h>
#include <netinet/in.h>
#include <netdb.h>
+#include <unistd.h>
+#include <fcntl.h>
#include "rpc_subs.h"
#include "replicated.h"
@@ -79,7 +81,7 @@ static unsigned int get_proximity(const
char tmp[20], buf[MAX_ERR_BUF], *ptr;
struct ifconf ifc;
struct ifreq *ifr, nmptr;
- int sock, ret, i;
+ int sock, cl_flags, ret, i;
uint32_t mask, ha, ia;
memcpy(tmp, host_addr, addr_len);
@@ -94,6 +96,11 @@ static unsigned int get_proximity(const
return PROXIMITY_ERROR;
}
+ if ((cl_flags = fcntl(sock, F_GETFD, 0)) != -1) {
+ cl_flags |= FD_CLOEXEC;
+ fcntl(sock, F_SETFD, cl_flags);
+ }
+
ifc.ifc_len = sizeof(buf);
ifc.ifc_req = (struct ifreq *) buf;
ret = ioctl(sock, SIOCGIFCONF, &ifc);
Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- autofs.spec 12 Dec 2006 03:35:07 -0000 1.169
+++ autofs.spec 14 Dec 2006 04:39:46 -0000 1.170
@@ -4,7 +4,7 @@
Summary: A tool for automatically mounting and unmounting filesystems.
Name: autofs
%define version 5.0.1
-%define release 0.rc2.35
+%define release 0.rc2.38
Version: %{version}
Release: %{release}
Epoch: 1
@@ -58,6 +58,9 @@
Patch44: autofs-5.0.1-rc2-change-mount-device-to-map-name.patch
Patch45: autofs-5.0.1-rc2-afs-buffer-overflow-check.patch
Patch46: autofs-5.0.1-rc2-replace-tempnam.patch
+Patch47: autofs-5.0.1-rc2-admit-slashify-colons.patch
+Patch48: autofs-5.0.1-rc2-allow-underscore-in-hostname.patch
+Patch49: autofs-5.0.1-rc2-set-socket-close-on-exec.patch
Buildroot: /var/tmp/autofs-tmp
BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
Prereq: chkconfig
@@ -144,6 +147,9 @@
%patch44 -p1
%patch45 -p1
%patch46 -p1
+%patch47 -p1
+%patch48 -p1
+%patch49 -p1
%build
#CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -200,6 +206,11 @@
%{_libdir}/autofs/*
%changelog
+* Thu Dec 14 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc2.38
+- update master map tokenizer to admit "slasify-colons" option.
+- update location validation to accept "_" (bz 219445).
+- set close-on-exec flag on open sockets (bz 215757).
+
* Mon Dec 11 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc2.35
- update "replace-tempnam" patch to create temp files in sane location.
@@ -218,7 +229,7 @@
* Wed Dec 6 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc2.29
- alter nfs4 host probing to not use portmap lookup and add options
- check for "port=" parameter (bz 208757.
+ check for "port=" parameter (bz 208757).
- correct semantics of "-null" map handling (bzs 214800, 208091).
* Sat Nov 25 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc2.26
More information about the fedora-cvs-commits
mailing list