rpms/autofs/devel autofs-5.0.3-handle-zero-length-nis-key.patch, NONE, 1.1 autofs-5.0.3-map-type-in-map-name.patch, NONE, 1.1 autofs-5.0.2-init-cb-on-load.patch, 1.1, 1.2 autofs.spec, 1.235, 1.236 autofs-5.0.3-device-node-and-active-restart-fixes.patch, 1.1, NONE autofs-5.0.3-device-node-control.patch, 1.1, NONE autofs-5.0.3-make-is_mounted-use-dev-ioctl.patch, 1.1, NONE
Ian Kent (iankent)
fedora-extras-commits at redhat.com
Mon Mar 24 05:17:30 UTC 2008
Author: iankent
Update of /cvs/pkgs/rpms/autofs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25591
Modified Files:
autofs-5.0.2-init-cb-on-load.patch autofs.spec
Added Files:
autofs-5.0.3-handle-zero-length-nis-key.patch
autofs-5.0.3-map-type-in-map-name.patch
Removed Files:
autofs-5.0.3-device-node-and-active-restart-fixes.patch
autofs-5.0.3-device-node-control.patch
autofs-5.0.3-make-is_mounted-use-dev-ioctl.patch
Log Message:
* Mon Mar 24 2008 Ian Kent <ikent at redhat.com> - 5.0.3-8
- revert miscellaneous device node related patches.
- add missing check for zero length NIS key.
- fix incorrect match of map type name when included in map name.
- update rev 7 sasl callbacks patch.
autofs-5.0.3-handle-zero-length-nis-key.patch:
--- NEW FILE autofs-5.0.3-handle-zero-length-nis-key.patch ---
diff -up autofs-5.0.3/CHANGELOG.handle-zero-length-nis-key autofs-5.0.3/CHANGELOG
--- autofs-5.0.3/CHANGELOG.handle-zero-length-nis-key 2008-03-24 14:07:30.000000000 +0900
+++ autofs-5.0.3/CHANGELOG 2008-03-24 14:08:08.000000000 +0900
@@ -8,6 +8,7 @@
- another fix for don't fail on empty master map.
- fix expire working harder than needed.
- fix unlink of mount tree incorrectly causing autofs mount fail.
+- add missing check for zero length NIS key (Wengang Wang).
14/01/2008 autofs-5.0.3
-----------------------
diff -up autofs-5.0.3/modules/lookup_yp.c.handle-zero-length-nis-key autofs-5.0.3/modules/lookup_yp.c
--- autofs-5.0.3/modules/lookup_yp.c.handle-zero-length-nis-key 2008-01-14 13:39:16.000000000 +0900
+++ autofs-5.0.3/modules/lookup_yp.c 2008-03-24 14:07:45.000000000 +0900
@@ -168,6 +168,10 @@ int yp_all_master_callback(int status, c
if (status != YP_TRUE)
return status;
+ /* Ignore zero length keys */
+ if (ypkeylen == 0)
+ return 0;
+
/*
* Ignore keys beginning with '+' as plus map
* inclusion is only valid in file maps.
@@ -263,6 +267,10 @@ int yp_all_callback(int status, char *yp
if (status != YP_TRUE)
return status;
+ /* Ignore zero length keys */
+ if (ypkeylen == 0)
+ return 0;
+
/*
* Ignore keys beginning with '+' as plus map
* inclusion is only valid in file maps.
autofs-5.0.3-map-type-in-map-name.patch:
--- NEW FILE autofs-5.0.3-map-type-in-map-name.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index af5a1b0..76f2477 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@
- update fix expire working harder than needed.
- add missing check for zero length NIS key (Wengang Wang).
- init SASL callbacks on every ldap lookup library load.
+- fix incorrect match of map type name when included in map name.
14/01/2008 autofs-5.0.3
-----------------------
diff --git a/lib/master_tok.l b/lib/master_tok.l
index b379940..9f4aaab 100644
--- a/lib/master_tok.l
+++ b/lib/master_tok.l
@@ -77,6 +77,7 @@ int my_yyinput(char *, int);
char buff[1024];
char *bptr;
char *optr = buff;
+char *tptr;
%}
@@ -189,17 +190,25 @@ OPTNTOUT (-n{OPTWS}|-n{OPTWS}={OPTWS}|--negative-timeout{OPTWS}|--negative-timeo
<MAPSTR>{
{OPTWS}\\\n{OPTWS} {}
- {MULTI} {
- strcpy(master_lval.strtype, master_text);
+ {WS}{MULTI} {
+ tptr = master_text;
+ while (*tptr && isblank(*tptr)) {
+ tptr++;
+ }
+ strcpy(master_lval.strtype, tptr);
return(MULTITYPE);
}
- {MTYPE} {
- strcpy(master_lval.strtype, master_text);
+ {WS}{MTYPE} {
+ tptr = master_text;
+ while (*tptr && isblank(*tptr)) {
+ tptr++;
+ }
+ strcpy(master_lval.strtype, tptr);
return(MAPTYPE);
}
- {MULTISEP} { return(DDASH); }
+ {WS}{MULTISEP} { return(DDASH); }
":" { return(COLON); }
autofs-5.0.2-init-cb-on-load.patch:
Index: autofs-5.0.2-init-cb-on-load.patch
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/autofs-5.0.2-init-cb-on-load.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- autofs-5.0.2-init-cb-on-load.patch 20 Mar 2008 02:44:49 -0000 1.1
+++ autofs-5.0.2-init-cb-on-load.patch 24 Mar 2008 05:17:20 -0000 1.2
@@ -1,6 +1,6 @@
-diff -up autofs-5.0.2/include/lookup_ldap.h.init-cb-on-load autofs-5.0.2/include/lookup_ldap.h
---- autofs-5.0.2/include/lookup_ldap.h.init-cb-on-load 2008-03-09 13:50:30.000000000 +0900
-+++ autofs-5.0.2/include/lookup_ldap.h 2008-03-09 13:52:52.000000000 +0900
+diff -up autofs-5.0.3/include/lookup_ldap.h.init-cb-on-load autofs-5.0.3/include/lookup_ldap.h
+--- autofs-5.0.3/include/lookup_ldap.h.init-cb-on-load 2008-01-14 13:39:16.000000000 +0900
++++ autofs-5.0.3/include/lookup_ldap.h 2008-03-24 14:10:09.000000000 +0900
@@ -99,10 +99,12 @@ int unbind_ldap_connection(unsigned logo
int authtype_requires_creds(const char *authtype);
@@ -15,9 +15,9 @@
#endif
#endif
-diff -up autofs-5.0.2/modules/lookup_ldap.c.init-cb-on-load autofs-5.0.2/modules/lookup_ldap.c
---- autofs-5.0.2/modules/lookup_ldap.c.init-cb-on-load 2008-03-09 13:50:30.000000000 +0900
-+++ autofs-5.0.2/modules/lookup_ldap.c 2008-03-09 13:58:47.000000000 +0900
+diff -up autofs-5.0.3/modules/lookup_ldap.c.init-cb-on-load autofs-5.0.3/modules/lookup_ldap.c
+--- autofs-5.0.3/modules/lookup_ldap.c.init-cb-on-load 2008-03-24 14:09:18.000000000 +0900
++++ autofs-5.0.3/modules/lookup_ldap.c 2008-03-24 14:10:09.000000000 +0900
@@ -599,7 +599,7 @@ static LDAP *connect_to_server(unsigned
if (!do_bind(logopt, ldap, ctxt)) {
@@ -60,9 +60,9 @@
#endif
free_context(ctxt);
return rv;
-diff -up autofs-5.0.2/modules/cyrus-sasl.c.init-cb-on-load autofs-5.0.2/modules/cyrus-sasl.c
---- autofs-5.0.2/modules/cyrus-sasl.c.init-cb-on-load 2008-03-09 13:50:30.000000000 +0900
-+++ autofs-5.0.2/modules/cyrus-sasl.c 2008-03-09 13:56:59.000000000 +0900
+diff -up autofs-5.0.3/modules/cyrus-sasl.c.init-cb-on-load autofs-5.0.3/modules/cyrus-sasl.c
+--- autofs-5.0.3/modules/cyrus-sasl.c.init-cb-on-load 2008-01-14 13:39:16.000000000 +0900
++++ autofs-5.0.3/modules/cyrus-sasl.c 2008-03-24 14:10:09.000000000 +0900
@@ -76,7 +76,6 @@ static const char *default_client = "aut
static pthread_mutex_t krb5cc_mutex = PTHREAD_MUTEX_INITIALIZER;
static unsigned int krb5cc_in_use = 0;
@@ -124,3 +124,14 @@
+ return;
+}
+
+diff -up autofs-5.0.3/CHANGELOG.init-cb-on-load autofs-5.0.3/CHANGELOG
+--- autofs-5.0.3/CHANGELOG.init-cb-on-load 2008-03-24 14:09:18.000000000 +0900
++++ autofs-5.0.3/CHANGELOG 2008-03-24 14:10:09.000000000 +0900
+@@ -9,6 +9,7 @@
+ - fix expire working harder than needed.
+ - fix unlink of mount tree incorrectly causing autofs mount fail.
+ - add missing check for zero length NIS key (Wengang Wang).
++- init SASL callbacks on every ldap lookup library load.
+
+ 14/01/2008 autofs-5.0.3
+ -----------------------
Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -r1.235 -r1.236
--- autofs.spec 20 Mar 2008 02:44:49 -0000 1.235
+++ autofs.spec 24 Mar 2008 05:17:20 -0000 1.236
@@ -4,7 +4,7 @@
Summary: A tool for automatically mounting and unmounting filesystems
Name: autofs
Version: 5.0.3
-Release: 7
+Release: 8
Epoch: 1
License: GPL
Group: System Environment/Daemons
@@ -18,11 +18,9 @@
Patch6: autofs-5.0.3-dont-fail-on-empty-master-fix-2.patch
Patch7: autofs-5.0.3-expire-works-too-hard.patch
Patch8: autofs-5.0.3-unlink-mount-return-fix.patch
-Patch9: autofs-5.0.3-device-node-control.patch
-Patch10: autofs-5.0.3-active-restart.patch
-Patch11: autofs-5.0.3-device-node-and-active-restart-fixes.patch
-Patch12: autofs-5.0.3-make-is_mounted-use-dev-ioctl.patch
-Patch13: autofs-5.0.2-init-cb-on-load.patch
+Patch9: autofs-5.0.3-handle-zero-length-nis-key.patch
+Patch10: autofs-5.0.2-init-cb-on-load.patch
+Patch11: autofs-5.0.3-map-type-in-map-name.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
Conflicts: kernel < 2.6.17
@@ -75,8 +73,6 @@
%patch9 -p1
%patch10 -p1
%patch11 -p1
-%patch12 -p1
-%patch13 -p1
%build
#CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -129,6 +125,12 @@
%{_libdir}/autofs/
%changelog
+* Mon Mar 24 2008 Ian Kent <ikent at redhat.com> - 5.0.3-8
+- revert miscellaneous device node related patches.
+- add missing check for zero length NIS key.
+- fix incorrect match of map type name when included in map name.
+- update rev 7 sasl callbacks patch.
+
* Thu Mar 20 2008 Ian Kent <ikent at redhat.com> - 5.0.3-7
- add patch to initialize sasl callbacks unconditionally on autofs
LDAP lookup library load.
--- autofs-5.0.3-device-node-and-active-restart-fixes.patch DELETED ---
--- autofs-5.0.3-device-node-control.patch DELETED ---
--- autofs-5.0.3-make-is_mounted-use-dev-ioctl.patch DELETED ---
More information about the fedora-extras-commits
mailing list