[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Libguestfs] [PATCH] daemon: augeas: filter out AUG_NO_STDINC from aug-init (RHBZ#1144927)



The lenses in our custom path need the system lens for base
definitions. Disabling the system path was worthless anyway, since our
API does not allow user-specified custom paths.

The only possible use for AUG_NO_STDINC to aug-init could have been to
not load the lenses right at init time loading them later; however, this
is what the AUG_NO_LOAD flag (= 32) does already.
---
 daemon/augeas.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/daemon/augeas.c b/daemon/augeas.c
index ce49726..4f1d9a8 100644
--- a/daemon/augeas.c
+++ b/daemon/augeas.c
@@ -133,6 +133,11 @@ do_aug_init (const char *root, int flags)
     return -1;
   }
 
+  /* Filter out AUG_NO_STDINC, since the lenses in our custom path
+   * need the lenses from the system path.
+   */
+  flags &= ~AUG_NO_STDINC;
+
   /* Pass AUG_NO_ERR_CLOSE so we can display detailed errors. */
   aug = aug_init (buf, "/usr/share/guestfs/", flags | AUG_NO_ERR_CLOSE);
 
-- 
1.9.3


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]