- don't use master_lex_destroy() to clear parse buffer.
- make documentation for set-log-priority clearer.
This commit is contained in:
Ian Kent
parent
2b02d9b82a
commit
f0c2949bbf
@ -0,0 +1,39 @@
|
||||
autofs-5.0.5 - don't use master_lex_destroy() to clear parse buffer
|
||||
|
||||
From: Ian Kent <raven@themaw.net>
|
||||
|
||||
Using master_lex_destroy() does not seem not to resolve the original
|
||||
problem it set out to solve in all cases. Change to using memset() to
|
||||
clear the buffer instead.
|
||||
---
|
||||
|
||||
CHANGELOG | 1 +
|
||||
lib/master_tok.l | 2 +-
|
||||
2 files changed, 2 insertions(+), 1 deletions(-)
|
||||
|
||||
|
||||
diff --git a/CHANGELOG b/CHANGELOG
|
||||
index e37dadb..329b028 100644
|
||||
--- a/CHANGELOG
|
||||
+++ b/CHANGELOG
|
||||
@@ -9,6 +9,7 @@
|
||||
- fix backwards #ifndef INET6.
|
||||
- fix stale initialization for file map instance.
|
||||
- add "preen" fsck for ext4 mounts.
|
||||
+- don't use master_lex_destroy() to clear parse buffer.
|
||||
|
||||
03/09/2009 autofs-5.0.5
|
||||
-----------------------
|
||||
diff --git a/lib/master_tok.l b/lib/master_tok.l
|
||||
index 373248b..be2ce10 100644
|
||||
--- a/lib/master_tok.l
|
||||
+++ b/lib/master_tok.l
|
||||
@@ -414,7 +414,7 @@ static void master_echo(void)
|
||||
|
||||
void master_set_scan_buffer(const char *buffer)
|
||||
{
|
||||
- master_lex_destroy();
|
||||
+ memset(buff, 0, sizeof(buff));
|
||||
optr = buff;
|
||||
|
||||
line = buffer;
|
||||
@ -6,17 +6,32 @@ Autofs performs a "preen" fsck at max mount count for ext2 and ext3, but not
|
||||
ext4.
|
||||
---
|
||||
|
||||
CHANGELOG | 1 +
|
||||
Makefile.conf.in | 3 ++
|
||||
configure | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
configure.in | 1
|
||||
include/config.h.in | 6 ++++
|
||||
configure | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
configure.in | 1 +
|
||||
include/config.h.in | 6 +++++
|
||||
modules/Makefile | 10 ++++++--
|
||||
modules/mount_ext2.c | 11 ++++----
|
||||
6 files changed, 87 insertions(+), 7 deletions(-)
|
||||
modules/mount_ext2.c | 11 +++++----
|
||||
7 files changed, 88 insertions(+), 7 deletions(-)
|
||||
|
||||
|
||||
--- autofs-5.0.4.orig/Makefile.conf.in
|
||||
+++ autofs-5.0.4/Makefile.conf.in
|
||||
diff --git a/CHANGELOG b/CHANGELOG
|
||||
index 8b62370..e37dadb 100644
|
||||
--- a/CHANGELOG
|
||||
+++ b/CHANGELOG
|
||||
@@ -8,6 +8,7 @@
|
||||
- more code analysis corrections (and fix a typo in an init script).
|
||||
- fix backwards #ifndef INET6.
|
||||
- fix stale initialization for file map instance.
|
||||
+- add "preen" fsck for ext4 mounts.
|
||||
|
||||
03/09/2009 autofs-5.0.5
|
||||
-----------------------
|
||||
diff --git a/Makefile.conf.in b/Makefile.conf.in
|
||||
index f0287c3..7670364 100644
|
||||
--- a/Makefile.conf.in
|
||||
+++ b/Makefile.conf.in
|
||||
@@ -44,6 +44,9 @@ EXT2FS = @HAVE_E2FSCK@
|
||||
# Support for calling e3fsck when mounting ext3 filesystems
|
||||
EXT3FS = @HAVE_E3FSCK@
|
||||
@ -27,8 +42,10 @@ ext4.
|
||||
LEX = @PATH_LEX@
|
||||
YACC = @PATH_YACC@
|
||||
RPCGEN = @PATH_RPCGEN@
|
||||
--- autofs-5.0.4.orig/configure
|
||||
+++ autofs-5.0.4/configure
|
||||
diff --git a/configure b/configure
|
||||
index 159f25f..f5b7d07 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -668,6 +668,8 @@ PATH_LEX
|
||||
LEX
|
||||
HAVE_MODPROBE
|
||||
@ -106,9 +123,11 @@ ext4.
|
||||
for ac_prog in modprobe
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
--- autofs-5.0.4.orig/configure.in
|
||||
+++ autofs-5.0.4/configure.in
|
||||
@@ -131,6 +131,7 @@ AF_PATH_INCLUDE(MOUNT, mount, /bin/mount
|
||||
diff --git a/configure.in b/configure.in
|
||||
index f649a58..78085bd 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -131,6 +131,7 @@ AF_PATH_INCLUDE(MOUNT, mount, /bin/mount, $searchpath)
|
||||
AF_PATH_INCLUDE(UMOUNT, umount, /bin/umount, $searchpath)
|
||||
AF_PATH_INCLUDE(E2FSCK, fsck.ext2 e2fsck, , $searchpath)
|
||||
AF_PATH_INCLUDE(E3FSCK, fsck.ext3 e3fsck, , $searchpath)
|
||||
@ -116,8 +135,10 @@ ext4.
|
||||
AF_PATH_INCLUDE(MODPROBE, modprobe, , $searchpath)
|
||||
|
||||
AF_CHECK_PROG(LEX, flex lex, , $searchpath)
|
||||
--- autofs-5.0.4.orig/include/config.h.in
|
||||
+++ autofs-5.0.4/include/config.h.in
|
||||
diff --git a/include/config.h.in b/include/config.h.in
|
||||
index 39cfa4b..dece33f 100644
|
||||
--- a/include/config.h.in
|
||||
+++ b/include/config.h.in
|
||||
@@ -18,6 +18,9 @@
|
||||
/* define if you have E3FSCK */
|
||||
#undef HAVE_E3FSCK
|
||||
@ -138,8 +159,10 @@ ext4.
|
||||
/* define if you have LEX */
|
||||
#undef PATH_LEX
|
||||
|
||||
--- autofs-5.0.4.orig/modules/Makefile
|
||||
+++ autofs-5.0.4/modules/Makefile
|
||||
diff --git a/modules/Makefile b/modules/Makefile
|
||||
index 13b3bd8..0bb9464 100644
|
||||
--- a/modules/Makefile
|
||||
+++ b/modules/Makefile
|
||||
@@ -69,10 +69,16 @@ ifeq ($(EXT2FS), 1)
|
||||
ifeq ($(EXT3FS), 1)
|
||||
ln -fs mount_ext2.so $(INSTALLROOT)$(autofslibdir)/mount_ext3.so
|
||||
@ -159,9 +182,11 @@ ext4.
|
||||
endif
|
||||
|
||||
#
|
||||
--- autofs-5.0.4.orig/modules/mount_ext2.c
|
||||
+++ autofs-5.0.4/modules/mount_ext2.c
|
||||
@@ -83,13 +83,14 @@ int mount_mount(struct autofs_point *ap,
|
||||
diff --git a/modules/mount_ext2.c b/modules/mount_ext2.c
|
||||
index 724a5fa..26d59d1 100644
|
||||
--- a/modules/mount_ext2.c
|
||||
+++ b/modules/mount_ext2.c
|
||||
@@ -83,13 +83,14 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int
|
||||
ro = 1;
|
||||
}
|
||||
|
||||
|
||||
@ -0,0 +1,43 @@
|
||||
autofs-5.0.5 - make documentation for set-log-priority clearer
|
||||
|
||||
From: Jeff Moyer <jmoyer@redhat.com>
|
||||
|
||||
It is not apparent from the documentation of the --set-log-priority
|
||||
option that the option can be used to change the log priority of the
|
||||
damon while it is running. This patch tries to fix that.
|
||||
|
||||
Signed-off-by: Jeff Moyer <jmoyer@redhat.com>
|
||||
---
|
||||
|
||||
CHANGELOG | 1 +
|
||||
man/automount.8 | 4 +++-
|
||||
2 files changed, 4 insertions(+), 1 deletions(-)
|
||||
|
||||
|
||||
diff --git a/CHANGELOG b/CHANGELOG
|
||||
index 329b028..ccf2d32 100644
|
||||
--- a/CHANGELOG
|
||||
+++ b/CHANGELOG
|
||||
@@ -10,6 +10,7 @@
|
||||
- fix stale initialization for file map instance.
|
||||
- add "preen" fsck for ext4 mounts.
|
||||
- don't use master_lex_destroy() to clear parse buffer.
|
||||
+- make documentation for set-log-priority clearer.
|
||||
|
||||
03/09/2009 autofs-5.0.5
|
||||
-----------------------
|
||||
diff --git a/man/automount.8 b/man/automount.8
|
||||
index 9fcaaf4..d9a45c2 100644
|
||||
--- a/man/automount.8
|
||||
+++ b/man/automount.8
|
||||
@@ -77,7 +77,9 @@ changes. For example, if verbose logging is set in the configuration then
|
||||
attempting to set logging to basic logging, by using alert, crit, err
|
||||
or emerg won't stop the verbose logging. However, setting logging to debug
|
||||
will lead to everything (debug logging) being logged witch can then also
|
||||
-be disabled, returning the daemon to verbose logging.
|
||||
+be disabled, returning the daemon to verbose logging. This option can be
|
||||
+specified to change the logging priority of an already running automount
|
||||
+process.
|
||||
.P
|
||||
The \fIpath\fP argument corresponds to the automounted
|
||||
path name as specified in the master map.
|
||||
10
autofs.spec
10
autofs.spec
@ -4,7 +4,7 @@
|
||||
Summary: A tool for automatically mounting and unmounting filesystems
|
||||
Name: autofs
|
||||
Version: 5.0.5
|
||||
Release: 5%{?dist}
|
||||
Release: 6%{?dist}
|
||||
Epoch: 1
|
||||
License: GPLv2+
|
||||
Group: System Environment/Daemons
|
||||
@ -19,6 +19,8 @@ Patch6: autofs-5.0.5-more-code-analysis-corrections.patch
|
||||
Patch7: autofs-5.0.5-fix-backwards-ifndef-INET6.patch
|
||||
Patch8: autofs-5.0.5-fix-stale-init-for-file-map-instance.patch
|
||||
Patch9: autofs-5.0.5-fix-ext4-fsck-at-mount.patch
|
||||
Patch10: autofs-5.0.5-dont-use-master_lex_destroy-to-clear-parse-buffer.patch
|
||||
Patch11: autofs-5.0.5-make-documentation-for-set-log-priority-clearer.patch
|
||||
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel module-init-tools util-linux nfs-utils e2fsprogs libtirpc-devel
|
||||
Requires: kernel >= 2.6.17
|
||||
@ -69,6 +71,8 @@ echo %{version}-%{release} > .version
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
%patch11 -p1
|
||||
|
||||
%build
|
||||
#CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
|
||||
@ -121,6 +125,10 @@ fi
|
||||
%{_libdir}/autofs/
|
||||
|
||||
%changelog
|
||||
* Mon Nov 16 2009 Ian Kent <ikent@redhat.com> - 1:5.0.5-6
|
||||
- don't use master_lex_destroy() to clear parse buffer.
|
||||
- make documentation for set-log-priority clearer.
|
||||
|
||||
* Tue Nov 10 2009 Ian Kent <ikent@redhat.com> - 1:5.0.5-5
|
||||
- fix ext4 "preen" fsck at mount.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user