Re: [autofs] Autofs dump map option
Hi Ian, Thanks for the quick help - it works, indeed. Funny thing: - The original patch I have submitted some time ago which was implementing the dump map option for the first time did not dump (without your patch) indirect maps either. - Your official patch implementing the dump map option *did* list the ldap indirect maps even without this fix, it just did not print the indirect nis maps. Why did it work for ldap maps? Anyway - it works fine now. Thanks, Ondrej I think this patch should help. autofs-5.0.6 - fix dumpmaps not reading maps From: Ian Kentra...@themaw.net The lookup modules won't read any indirect map entries (other than those in a file map) unless unless the browse option is set. In order to list the entries when tyhe dumpmap option is given the browse option needs to be set. --- CHANGELOG|1 + lib/master.c |9 + 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 884a9ae..946a196 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ - fix ipv6 name for lookup fix. - improve mount location error reporting. - fix paged query more results check. +- fix dumpmaps not reading maps. 28/06/2011 autofs-5.0.6 --- diff --git a/lib/master.c b/lib/master.c index 153a38b..6c89e1d 100644 --- a/lib/master.c +++ b/lib/master.c @@ -1283,6 +1283,15 @@ int master_show_mounts(struct master *master) printf(\nMount point: %s\n, ap-path); printf(\nsource(s):\n); + /* +* Ensure we actually read indirect map entries so we can +* list them. The map reads won't read any indirect map +* entries (other than those in a file map) unless the +* browse option is set. +*/ + if (ap-type == LKP_INDIRECT) + ap-flags |= MOUNT_FLAG_GHOST; + /* Read the map content into the cache */ if (lookup_nss_read_map(ap, NULL, now)) lookup_prune_cache(ap, now); The information contained in this e-mail and in any attachments is confidential and is designated solely for the attention of the intended recipient(s). If you are not an intended recipient, you must not use, disclose, copy, distribute or retain this e-mail or any part thereof. If you have received this e-mail in error, please notify the sender by return e-mail and delete all copies of this e-mail from your computer system(s). Please direct any additional queries to: communicati...@s3group.com. Thank You. Silicon and Software Systems Limited (S3 Group). Registered in Ireland no. 378073. Registered Office: South County Business Park, Leopardstown, Dublin 18___ autofs mailing list autofs@linux.kernel.org http://linux.kernel.org/mailman/listinfo/autofs
Re: [autofs] Autofs dump map option
On Fri, 2011-08-05 at 11:11 +0200, Ondrej Valousek wrote: Hi Ian, Thanks for looking after the bugs #538408 and #704416 for me, but I have one slight problem with it: Automouter won't show any keys in my indirect NIS maps unless I specify BROWSE_MODE=yes. Maybe it is expected behaviour so I was thinking - can we always force browse_mode when dumping maps? Sorry for spotting this too late. Ha, I'll have a look and see what we need to do. I'm on leave between the 8th and 13th and will have limited internet connectivity so I likely won't be able to do much until I get back. Thanks, Ondrej __ The information contained in this e-mail and in any attachments is confidential and is designated solely for the attention of the intended recipient(s). If you are not an intended recipient, you must not use, disclose, copy, distribute or retain this e-mail or any part thereof. If you have received this e-mail in error, please notify the sender by return e-mail and delete all copies of this e-mail from your computer system(s). Please direct any additional queries to: communicati...@s3group.com. Thank You. Silicon and Software Systems Limited (S3 Group). Registered in Ireland no. 378073. Registered Office: South County Business Park, Leopardstown, Dublin 18 __ ___ autofs mailing list autofs@linux.kernel.org http://linux.kernel.org/mailman/listinfo/autofs
Re: [autofs] Autofs dump map option
On Sat, 2011-08-06 at 16:54 +0800, Ian Kent wrote: On Fri, 2011-08-05 at 11:11 +0200, Ondrej Valousek wrote: Hi Ian, Thanks for looking after the bugs #538408 and #704416 for me, but I have one slight problem with it: Automouter won't show any keys in my indirect NIS maps unless I specify BROWSE_MODE=yes. Maybe it is expected behaviour so I was thinking - can we always force browse_mode when dumping maps? Sorry for spotting this too late. Ha, I'll have a look and see what we need to do. I'm on leave between the 8th and 13th and will have limited internet connectivity so I likely won't be able to do much until I get back. I think this patch should help. autofs-5.0.6 - fix dumpmaps not reading maps From: Ian Kent ra...@themaw.net The lookup modules won't read any indirect map entries (other than those in a file map) unless unless the browse option is set. In order to list the entries when tyhe dumpmap option is given the browse option needs to be set. --- CHANGELOG|1 + lib/master.c |9 + 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 884a9ae..946a196 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ - fix ipv6 name for lookup fix. - improve mount location error reporting. - fix paged query more results check. +- fix dumpmaps not reading maps. 28/06/2011 autofs-5.0.6 --- diff --git a/lib/master.c b/lib/master.c index 153a38b..6c89e1d 100644 --- a/lib/master.c +++ b/lib/master.c @@ -1283,6 +1283,15 @@ int master_show_mounts(struct master *master) printf(\nMount point: %s\n, ap-path); printf(\nsource(s):\n); + /* +* Ensure we actually read indirect map entries so we can +* list them. The map reads won't read any indirect map +* entries (other than those in a file map) unless the +* browse option is set. +*/ + if (ap-type == LKP_INDIRECT) + ap-flags |= MOUNT_FLAG_GHOST; + /* Read the map content into the cache */ if (lookup_nss_read_map(ap, NULL, now)) lookup_prune_cache(ap, now); ___ autofs mailing list autofs@linux.kernel.org http://linux.kernel.org/mailman/listinfo/autofs
