#include "daemon.h"
#include "actions.h"
+#include "optgroups.h"
#ifdef HAVE_AUGEAS
/* The Augeas handle. We maintain a single handle per daemon, which
} \
} \
while (0)
+
+int
+optgroup_augeas_available (void)
+{
+ return 1;
+}
+#else /* !HAVE_AUGEAS */
+int
+optgroup_augeas_available (void)
+{
+ return 0;
+}
#endif
/* We need to rewrite the root path so it is based at /sysroot. */
return 0;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
return 0;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
}
return r;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
r.b = created;
return &r;
#else
- reply_with_error ("%s is not available", __func__);
- return NULL;
+ NOT_AVAILABLE (NULL);
#endif
}
return v; /* Caller frees. */
#else
- reply_with_error ("%s is not available", __func__);
- return NULL;
+ NOT_AVAILABLE (NULL);
#endif
}
return 0;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
+#endif
+}
+
+int
+do_aug_clear (const char *path)
+{
+#ifdef HAVE_AUGEAS
+ int r;
+
+ NEED_AUG (-1);
+
+ r = aug_set (aug, path, NULL);
+ if (r == -1) {
+ reply_with_error ("Augeas clear failed");
+ return -1;
+ }
+
+ return 0;
+#else
+ NOT_AVAILABLE (-1);
#endif
}
return 0;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
return r;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
return 0;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
return matches; /* Caller frees. */
#else
- reply_with_error ("%s is not available", __func__);
- return NULL;
+ NOT_AVAILABLE (NULL);
#endif
}
return 0;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
return 0;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
NEED_AUG (NULL);
- ABS_PATH (path, return NULL);
+ /* Note that path might also be a previously defined variable
+ * (defined with aug_defvar). See RHBZ#580016.
+ */
len = strlen (path);
return NULL;
}
- if (len == 1)
- /* we know path must be "/" because of ABS_PATH above */
- matches = do_aug_match ("/");
+ if (STREQ (path, "/"))
+ matches = do_aug_match ("/*");
else {
len += 3; /* / * + terminating \0 */
buf = malloc (len);
sort_strings (matches, count_strings ((void *) matches));
return matches; /* Caller frees. */
#else
- reply_with_error ("%s is not available", __func__);
- return NULL;
+ NOT_AVAILABLE (NULL);
#endif
}