OSTree API references |
|---|
for OSTree 2016.14
for OSTree 2016.15
out_objects
-Map of serialized object name to variant data.
Map of serialized object name to variant data.
cancellable
start
out_commits
Array of GVariants
Map of serialized commit name to variant data.
cancellable
gboolean +ostree_repo_prune_from_reachable (+OstreeRepo *self, +OstreeRepoPruneOptions *options, +gint *out_objects_total, +gint *out_objects_pruned, +guint64 *out_pruned_object_size_total, +GCancellable *cancellable, +GError **error);
Delete content from the repository. This function is the "backend"
+half of the higher level ostree_repo_prune(). To use this function,
+you determine the root set yourself, and this function finds all other
+unreferenced objects and deletes them.
Use this API when you want to perform more selective pruning - for example, +retain all commits from a production branch, but just GC some history from +your dev branch.
+The OSTREE_REPO_PRUNE_FLAGS_NO_PRUNE flag may be specified to just determine
+statistics on objects that would be deleted, without actually deleting them.
self |
+Repo |
++ |
options |
+Options controlling prune process |
++ |
out_objects_total |
+Number of objects found. |
+[out] | +
out_objects_pruned |
+Number of objects deleted. |
+[out] | +
out_pruned_object_size_total |
+Storage size in bytes of objects deleted. |
+[out] | +
cancellable |
+Cancellable |
++ |
error |
+Error |
++ |
gboolean ostree_repo_pull (OstreeRepo *self, diff --git a/apidoc/html/ostree.devhelp2 b/apidoc/html/ostree.devhelp2 index 734596e6..08fa2960 100644 --- a/apidoc/html/ostree.devhelp2 +++ b/apidoc/html/ostree.devhelp2 @@ -186,6 +186,7 @@+ diff --git a/apidoc/html/reference.html b/apidoc/html/reference.html index 5643d548..fa2e25d8 100644 --- a/apidoc/html/reference.html +++ b/apidoc/html/reference.html @@ -918,6 +918,10 @@
\r\n", escaped);
+ g_free (escaped);
+ for (i = 0; i < entries->len; i++)
+ {
+ g_string_append_printf (listing, "%s \r\n", escaped);
- g_free (escaped);
- for (i = 0; i < entries->len; i++)
- {
- g_string_append_printf (listing, "%s
\r\n",
+ (char *)entries->pdata[i],
+ (char *)entries->pdata[i]);
+ g_free (g_steal_pointer (&entries->pdata[i]));
+ }
+ g_string_append (listing, "\r\n\r\n");
+ out:
+ if (local_error)
+ g_printerr ("%s\n", local_error->message);
+ return listing;
+}
+
+/* Only allow reading files that have o+r, and for directories, o+x.
+ * This makes this server relatively safe to use on multiuser
+ * machines.
+ */
+static gboolean
+is_safe_to_access (struct stat *stbuf)
+{
+ /* Only regular files or directores */
+ if (!(S_ISREG (stbuf->st_mode) || S_ISDIR (stbuf->st_mode)))
+ return FALSE;
+ /* Must be o+r */
+ if (!(stbuf->st_mode & S_IROTH))
+ return FALSE;
+ /* For directories, must be o+x */
+ if (S_ISDIR (stbuf->st_mode) && !(stbuf->st_mode & S_IXOTH))
+ return FALSE;
+ return TRUE;
+}
+
+static void
+close_socket (SoupMessage *msg, gpointer user_data)
+{
+ SoupSocket *sock = user_data;
+ int sockfd;
+
+ /* Actually calling soup_socket_disconnect() here would cause
+ * us to leak memory, so just shutdown the socket instead.
+ */
+ sockfd = soup_socket_get_fd (sock);
+#ifdef G_OS_WIN32
+ shutdown (sockfd, SD_SEND);
+#else
+ shutdown (sockfd, SHUT_WR);
+#endif
+}
+
+static void
+do_get (OtTrivialHttpd *self,
+ SoupServer *server,
+ SoupMessage *msg,
+ const char *path,
+ SoupClientContext *context)
+{
+ char *slash;
+ int ret;
+ struct stat stbuf;
+
+ httpd_log (self, "serving %s\n", path);
+
+ if (opt_expected_cookies)
+ {
+ GSList *cookies = soup_cookies_from_request (msg);
+ GSList *l;
+ int i;
+
+ for (i = 0 ; opt_expected_cookies[i] != NULL; i++)
+ {
+ gboolean found = FALSE;
+ gchar *k = opt_expected_cookies[i];
+ gchar *v = strchr (k, '=') + 1;
+
+ for (l = cookies; l != NULL ; l = g_slist_next (l))
+ {
+ SoupCookie *c = l->data;
+
+ if (!strncmp (k, soup_cookie_get_name (c), v - k - 1) &&
+ !strcmp (v, soup_cookie_get_value (c)))
+ {
+ found = TRUE;
+ break;
+ }
+ }
+
+ if (!found)
+ {
+ httpd_log (self, "Expected cookie not found %s\n", k);
+ soup_message_set_status (msg, SOUP_STATUS_FORBIDDEN);
+ soup_cookies_free (cookies);
+ goto out;
+ }
+ }
+ soup_cookies_free (cookies);
+ }
+
+ if (opt_expected_headers)
+ {
+ for (int i = 0 ; opt_expected_headers[i] != NULL; i++)
+ {
+ const gchar *kv = opt_expected_headers[i];
+ const gchar *eq = strchr (kv, '=');
+
+ g_assert (eq);
+
+ {
+ g_autofree char *k = g_strndup (kv, eq - kv);
+ const gchar *expected_v = eq + 1;
+ const gchar *found_v = soup_message_headers_get_one (msg->request_headers, k);
+
+ if (!found_v)
+ {
+ httpd_log (self, "Expected header not found %s\n", k);
+ soup_message_set_status (msg, SOUP_STATUS_FORBIDDEN);
+ goto out;
+ }
+ if (strcmp (found_v, expected_v) != 0)
+ {
+ httpd_log (self, "Expected header %s: %s but found %s\n", k, expected_v, found_v);
+ soup_message_set_status (msg, SOUP_STATUS_FORBIDDEN);
+ goto out;
+ }
+ }
+ }
+ }
+
+ if (strstr (path, "../") != NULL)
+ {
+ soup_message_set_status (msg, SOUP_STATUS_FORBIDDEN);
+ goto out;
+ }
+
+ if (opt_random_500s_percentage > 0 &&
+ emitted_random_500s_count < opt_random_500s_max &&
+ g_random_int_range (0, 100) < opt_random_500s_percentage)
+ {
+ emitted_random_500s_count++;
+ soup_message_set_status (msg, SOUP_STATUS_INTERNAL_SERVER_ERROR);
+ goto out;
+ }
+
+ while (path[0] == '/')
+ path++;
+
+ do
+ ret = fstatat (self->root_dfd, path, &stbuf, 0);
+ while (ret == -1 && errno == EINTR);
+ if (ret == -1)
+ {
+ if (errno == EPERM)
+ soup_message_set_status (msg, SOUP_STATUS_FORBIDDEN);
+ else if (errno == ENOENT)
+ soup_message_set_status (msg, SOUP_STATUS_NOT_FOUND);
+ else
+ soup_message_set_status (msg, SOUP_STATUS_INTERNAL_SERVER_ERROR);
+ goto out;
+ }
+
+ if (!is_safe_to_access (&stbuf))
+ {
+ soup_message_set_status (msg, SOUP_STATUS_FORBIDDEN);
+ goto out;
+ }
+
+ if (S_ISDIR (stbuf.st_mode))
+ {
+ slash = strrchr (path, '/');
+ if (!slash || slash[1])
+ {
+ g_autofree char *redir_uri = NULL;
+
+ redir_uri = g_strdup_printf ("%s/", soup_message_get_uri (msg)->path);
+ soup_message_set_redirect (msg, SOUP_STATUS_MOVED_PERMANENTLY,
+ redir_uri);
+ }
+ else
+ {
+ g_autofree char *index_realpath = g_strconcat (path, "/index.html", NULL);
+ if (fstatat (self->root_dfd, index_realpath, &stbuf, 0) != -1)
+ {
+ g_autofree char *index_path = g_strconcat (path, "/index.html", NULL);
+ do_get (self, server, msg, index_path, context);
+ }
+ else
+ {
+ GString *listing = get_directory_listing (self->root_dfd, path);
+ soup_message_set_response (msg, "text/html",
+ SOUP_MEMORY_TAKE,
+ listing->str, listing->len);
+ soup_message_set_status (msg, SOUP_STATUS_OK);
+ g_string_free (listing, FALSE);
+ }
+ }
+ }
+ else
+ {
+ if (!S_ISREG (stbuf.st_mode))
+ {
+ soup_message_set_status (msg, SOUP_STATUS_FORBIDDEN);
+ goto out;
+ }
+
+ if (msg->method == SOUP_METHOD_GET)
+ {
+ glnx_fd_close int fd = -1;
+ g_autoptr(GMappedFile) mapping = NULL;
+ gsize buffer_length, file_size;
+ SoupRange *ranges;
+ int ranges_length;
+ gboolean have_ranges;
+
+ fd = openat (self->root_dfd, path, O_RDONLY | O_CLOEXEC);
+ if (fd < 0)
+ {
+ soup_message_set_status (msg, SOUP_STATUS_INTERNAL_SERVER_ERROR);
+ goto out;
+ }
+
+ mapping = g_mapped_file_new_from_fd (fd, FALSE, NULL);
+ if (!mapping)
+ {
+ soup_message_set_status (msg, SOUP_STATUS_INTERNAL_SERVER_ERROR);
+ goto out;
+ }
+ (void) close (fd); fd = -1;
+
+ file_size = g_mapped_file_get_length (mapping);
+ have_ranges = soup_message_headers_get_ranges(msg->request_headers, file_size, &ranges, &ranges_length);
+ if (opt_force_ranges && !have_ranges && g_strrstr (path, "/objects") != NULL)
+ {
+ SoupSocket *sock;
+ buffer_length = file_size/2;
+ soup_message_headers_set_content_length (msg->response_headers, file_size);
+ soup_message_headers_append (msg->response_headers,
+ "Connection", "close");
+
+ /* soup-message-io will wait for us to add
+ * another chunk after the first, to fill out
+ * the declared Content-Length. Instead, we
+ * forcibly close the socket at that point.
+ */
+ sock = soup_client_context_get_socket (context);
+ g_signal_connect (msg, "wrote-chunk", G_CALLBACK (close_socket), sock);
+ }
+ else
+ buffer_length = file_size;
+
+ if (have_ranges)
+ {
+ if (ranges_length > 0 && ranges[0].start >= file_size)
+ {
+ soup_message_set_status (msg, SOUP_STATUS_REQUESTED_RANGE_NOT_SATISFIABLE);
+ soup_message_headers_free_ranges (msg->request_headers, ranges);
+ goto out;
+ }
+ soup_message_headers_free_ranges (msg->request_headers, ranges);
+ }
+ if (buffer_length > 0)
+ {
+ SoupBuffer *buffer;
+
+ buffer = soup_buffer_new_with_owner (g_mapped_file_get_contents (mapping),
+ buffer_length,
+ g_mapped_file_ref (mapping),
+ (GDestroyNotify)g_mapped_file_unref);
+ soup_message_body_append_buffer (msg->response_body, buffer);
+ soup_buffer_free (buffer);
+ }
+ }
+ else /* msg->method == SOUP_METHOD_HEAD */
+ {
+ g_autofree char *length = NULL;
+
+ /* We could just use the same code for both GET and
+ * HEAD (soup-message-server-io.c will fix things up).
+ * But we'll optimize and avoid the extra I/O.
+ */
+ length = g_strdup_printf ("%lu", (gulong)stbuf.st_size);
+ soup_message_headers_append (msg->response_headers,
+ "Content-Length", length);
+ }
+ soup_message_set_status (msg, SOUP_STATUS_OK);
+ }
+ out:
+ {
+ guint status = 0;
+ g_autofree gchar *reason = NULL;
+
+ g_object_get (msg,
+ "status-code", &status,
+ "reason-phrase", &reason,
+ NULL);
+ httpd_log (self, " status: %s (%u)\n", reason, status);
+ }
+ return;
+}
+
+static void
+httpd_callback (SoupServer *server, SoupMessage *msg,
+ const char *path, GHashTable *query,
+ SoupClientContext *context, gpointer data)
+{
+ OtTrivialHttpd *self = data;
+
+ if (msg->method == SOUP_METHOD_GET || msg->method == SOUP_METHOD_HEAD)
+ do_get (self, server, msg, path, context);
+ else
+ soup_message_set_status (msg, SOUP_STATUS_NOT_IMPLEMENTED);
+}
+
+static void
+on_dir_changed (GFileMonitor *mon,
+ GFile *file,
+ GFile *other,
+ GFileMonitorEvent event,
+ gpointer user_data)
+{
+ OtTrivialHttpd *self = user_data;
+
+ if (event == G_FILE_MONITOR_EVENT_DELETED)
+ {
+ self->running = FALSE;
+ g_main_context_wakeup (NULL);
+ }
+}
+
+static gboolean
+run (int argc, char **argv, GCancellable *cancellable, GError **error)
+{
+ gboolean ret = FALSE;
+ g_autoptr(GOptionContext) context = NULL;
+ const char *dirpath;
+ OtTrivialHttpd appstruct = { 0, };
+ OtTrivialHttpd *app = &appstruct;
+ glnx_unref_object SoupServer *server = NULL;
+ g_autoptr(GFileMonitor) dirmon = NULL;
+
+ context = g_option_context_new ("[DIR] - Simple webserver");
+ g_option_context_add_main_entries (context, options, NULL);
+
+ app->root_dfd = -1;
+
+ if (!g_option_context_parse (context, &argc, &argv, error))
+ goto out;
+
+ if (argc > 1)
+ dirpath = argv[1];
+ else
+ dirpath = ".";
+
+ if (!glnx_opendirat (AT_FDCWD, dirpath, TRUE, &app->root_dfd, error))
+ goto out;
+
+ if (!(opt_random_500s_percentage >= 0 && opt_random_500s_percentage <= 99))
+ {
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+ "Invalid --random-500s=%u", opt_random_500s_percentage);
+ goto out;
+ }
+
+ if (opt_log)
+ {
+ GOutputStream *stream = NULL;
+
+ if (g_strcmp0 (opt_log, "-") == 0)
+ {
+ if (opt_daemonize)
+ {
+ ot_util_usage_error (context, "Cannot use --log-file=- and --daemonize at the same time", error);
+ goto out;
+ }
+ stream = G_OUTPUT_STREAM (g_unix_output_stream_new (STDOUT_FILENO, FALSE));
+ }
+ else
+ {
+ g_autoptr(GFile) log_file;
+ GFileOutputStream* log_stream;
+
+ log_file = g_file_new_for_path (opt_log);
+ log_stream = g_file_create (log_file,
+ G_FILE_CREATE_PRIVATE,
+ cancellable,
+ error);
+ if (!log_stream)
+ goto out;
+ stream = G_OUTPUT_STREAM (log_stream);
+ }
+
+ app->log = stream;
+ }
+
+#if SOUP_CHECK_VERSION(2, 48, 0)
+ server = soup_server_new (SOUP_SERVER_SERVER_HEADER, "ostree-httpd ", NULL);
+ if (!soup_server_listen_all (server, opt_port, 0, error))
+ goto out;
+#else
+ server = soup_server_new (SOUP_SERVER_PORT, opt_port,
+ SOUP_SERVER_SERVER_HEADER, "ostree-httpd ",
+ NULL);
+#endif
+
+ soup_server_add_handler (server, NULL, httpd_callback, app, NULL);
+ if (opt_port_file)
+ {
+ g_autofree char *portstr = NULL;
+#if SOUP_CHECK_VERSION(2, 48, 0)
+ GSList *listeners = soup_server_get_listeners (server);
+ g_autoptr(GSocket) listener = NULL;
+ g_autoptr(GSocketAddress) addr = NULL;
+
+ g_assert (listeners);
+ listener = g_object_ref (listeners->data);
+ g_slist_free (listeners);
+ listeners = NULL;
+ addr = g_socket_get_local_address (listener, error);
+ if (!addr)
+ goto out;
+
+ g_assert (G_IS_INET_SOCKET_ADDRESS (addr));
+
+ portstr = g_strdup_printf ("%u\n", g_inet_socket_address_get_port ((GInetSocketAddress*)addr));
+#else
+ portstr = g_strdup_printf ("%u\n", soup_server_get_port (server));
+#endif
+
+ if (g_strcmp0 ("-", opt_port_file) == 0)
+ {
+ fputs (portstr, stdout); // not g_print - this must go to stdout, not a handler
+ fflush (stdout);
+ }
+ else if (!g_file_set_contents (opt_port_file, portstr, strlen (portstr), error))
+ goto out;
+ }
+#if !SOUP_CHECK_VERSION(2, 48, 0)
+ soup_server_run_async (server);
+#endif
+
+ if (opt_daemonize)
+ {
+ pid_t pid = fork();
+ if (pid == -1)
+ {
+ int errsv = errno;
+ g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errsv),
+ g_strerror (errsv));
+ goto out;
+ }
+ else if (pid > 0)
+ {
+ ret = TRUE;
+ goto out;
+ }
+ /* Child, continue */
+ if (setsid () < 0)
+ err (1, "setsid");
+ /* Daemonising: close stdout/stderr so $() et al work on us */
+ freopen("/dev/null", "r", stdin);
+ freopen("/dev/null", "w", stdout);
+ freopen("/dev/null", "w", stderr);
+ }
+ else
+ {
+ /* Since we're used for testing purposes, let's just do this by
+ * default. This ensures we exit when our parent does.
+ */
+ if (prctl (PR_SET_PDEATHSIG, SIGTERM) != 0)
+ {
+ if (errno != ENOSYS)
+ {
+ glnx_set_error_from_errno (error);
+ goto out;
+ }
+ }
+ }
+
+ app->running = TRUE;
+ if (opt_autoexit)
+ {
+ gboolean is_symlink = FALSE;
+ g_autoptr(GFile) root = NULL;
+ g_autoptr(GFileInfo) info = NULL;
+
+ root = g_file_new_for_path (dirpath);
+ info = g_file_query_info (root,
+ G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK,
+ G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+ cancellable, error);
+ if (!info)
+ goto out;
+
+ is_symlink = g_file_info_get_is_symlink (info);
+
+ if (is_symlink)
+ dirmon = g_file_monitor_file (root, 0, cancellable, error);
+ else
+ dirmon = g_file_monitor_directory (root, 0, cancellable, error);
+
+ if (!dirmon)
+ goto out;
+ g_signal_connect (dirmon, "changed", G_CALLBACK (on_dir_changed), app);
+ }
+ httpd_log (app, "serving at root %s\n", dirpath);
+ while (app->running)
+ g_main_context_iteration (NULL, TRUE);
+
+ ret = TRUE;
+ out:
+ if (app->root_dfd != -1)
+ (void) close (app->root_dfd);
+ g_clear_object (&app->log);
+ return ret;
+}
+
+int
+main (int argc,
+ char **argv)
+{
+ g_autoptr(GError) error = NULL;
+ g_autoptr(GCancellable) cancellable = NULL;
+
+ setlocale (LC_ALL, "");
+
+ g_set_prgname (argv[0]);
+
+ if (!run (argc, argv, cancellable, &error))
+ {
+ int is_tty = isatty (1);
+ const char *prefix = "";
+ const char *suffix = "";
+ if (is_tty)
+ {
+ prefix = "\x1b[31m\x1b[1m"; /* red, bold */
+ suffix = "\x1b[22m\x1b[0m"; /* bold off, color reset */
+ }
+ g_printerr ("%serror: %s%s\n", prefix, suffix, error->message);
+ return 1;
+ }
+
+ return 0;
+}
diff --git a/src/ostree/ot-admin-builtin-unlock.c b/src/ostree/ot-admin-builtin-unlock.c
index 0f22d0a6..aecba51b 100644
--- a/src/ostree/ot-admin-builtin-unlock.c
+++ b/src/ostree/ot-admin-builtin-unlock.c
@@ -34,7 +34,7 @@
static gboolean opt_hotfix;
static GOptionEntry options[] = {
- { "hotfix", 0, 0, G_OPTION_ARG_NONE, &opt_hotfix, "Keep the current deployment as default", NULL },
+ { "hotfix", 0, 0, G_OPTION_ARG_NONE, &opt_hotfix, "Retain changes across reboots", NULL },
{ NULL }
};
diff --git a/src/ostree/ot-admin-functions.c b/src/ostree/ot-admin-functions.c
index ed4dfdfb..7ba2207e 100644
--- a/src/ostree/ot-admin-functions.c
+++ b/src/ostree/ot-admin-functions.c
@@ -164,7 +164,7 @@ ot_admin_execve_reboot (OstreeSysroot *sysroot, GError **error)
if (g_file_equal (ostree_sysroot_get_path (sysroot), real_sysroot))
{
- if (execl ("systemctl", "systemctl", "reboot", NULL) < 0)
+ if (execlp ("systemctl", "systemctl", "reboot", NULL) < 0)
{
glnx_set_error_from_errno (error);
return FALSE;
diff --git a/src/ostree/ot-builtin-prune.c b/src/ostree/ot-builtin-prune.c
index d226c84b..853c051f 100644
--- a/src/ostree/ot-builtin-prune.c
+++ b/src/ostree/ot-builtin-prune.c
@@ -34,6 +34,7 @@ static gint opt_depth = -1;
static gboolean opt_refs_only;
static char *opt_delete_commit;
static char *opt_keep_younger_than;
+static char **opt_retain_branch_depth;
static GOptionEntry options[] = {
{ "no-prune", 0, 0, G_OPTION_ARG_NONE, &opt_no_prune, "Only display unreachable objects; don't delete", NULL },
@@ -42,6 +43,7 @@ static GOptionEntry options[] = {
{ "delete-commit", 0, 0, G_OPTION_ARG_STRING, &opt_delete_commit, "Specify a commit to delete", "COMMIT" },
{ "keep-younger-than", 0, 0, G_OPTION_ARG_STRING, &opt_keep_younger_than, "Prune all commits older than the specified date", "DATE" },
{ "static-deltas-only", 0, 0, G_OPTION_ARG_NONE, &opt_static_deltas_only, "Change the behavior of delete-commit and keep-younger-than to prune only static deltas" },
+ { "retain-branch-depth", 0, 0, G_OPTION_ARG_STRING_ARRAY, &opt_retain_branch_depth, "Additionally retain BRANCH=DEPTH commits", "BRANCH=DEPTH" },
{ NULL }
};
@@ -82,87 +84,53 @@ delete_commit (OstreeRepo *repo, const char *commit_to_delete, GCancellable *can
}
static gboolean
-prune_commits_keep_younger_than_date (OstreeRepo *repo, const char *date, GCancellable *cancellable, GError **error)
+traverse_keep_younger_than (OstreeRepo *repo, const char *checksum,
+ struct timespec *ts,
+ GHashTable *reachable,
+ GCancellable *cancellable, GError **error)
{
- g_autoptr(GHashTable) refs = NULL;
- g_autoptr(GHashTable) ref_heads = g_hash_table_new (g_str_hash, g_str_equal);
- g_autoptr(GHashTable) objects = NULL;
- GHashTableIter hash_iter;
- gpointer key, value;
- struct timespec ts;
- gboolean ret = FALSE;
+ g_autofree char *next_checksum = g_strdup (checksum);
+ g_autoptr(GVariant) commit = NULL;
- if (!parse_datetime (&ts, date, NULL))
- {
- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
- "Could not parse '%s'", date);
- goto out;
- }
-
- if (!ot_enable_tombstone_commits (repo, error))
- goto out;
-
- if (!ostree_repo_list_refs (repo, NULL, &refs, cancellable, error))
- goto out;
-
- /* We used to prune the HEAD of a given ref by default, but that's
- * broken for a few reasons. One is that people may use branches as
- * tags. Second is that if we do it, we should be deleting the ref
- * too, otherwise e.g. `summary -u` breaks trying to load it, etc.
+ /* This is the first commit in our loop, which has a ref pointing to it. We
+ * don't want to auto-prune it.
*/
- g_hash_table_iter_init (&hash_iter, refs);
- while (g_hash_table_iter_next (&hash_iter, &key, &value))
+ if (!ostree_repo_traverse_commit_union (repo, checksum, 0, reachable,
+ cancellable, error))
+ return FALSE;
+
+ while (TRUE)
{
- /* Value is lifecycle bound to refs */
- g_hash_table_add (ref_heads, (char*)value);
- }
-
- if (!ostree_repo_list_objects (repo, OSTREE_REPO_LIST_OBJECTS_ALL, &objects,
- cancellable, error))
- goto out;
-
- g_hash_table_iter_init (&hash_iter, objects);
-
- while (g_hash_table_iter_next (&hash_iter, &key, &value))
- {
- GVariant *serialized_key = key;
- const char *checksum;
- OstreeObjectType objtype;
guint64 commit_timestamp;
- g_autoptr(GVariant) commit = NULL;
- ostree_object_name_deserialize (serialized_key, &checksum, &objtype);
+ if (!ostree_repo_load_variant_if_exists (repo, OSTREE_OBJECT_TYPE_COMMIT, next_checksum,
+ &commit, error))
+ return FALSE;
- if (objtype != OSTREE_OBJECT_TYPE_COMMIT)
- continue;
-
- if (g_hash_table_contains (ref_heads, checksum))
- continue;
-
- if (!ostree_repo_load_variant (repo, OSTREE_OBJECT_TYPE_COMMIT, checksum,
- &commit, error))
- goto out;
+ if (!commit)
+ break; /* This commit was pruned, so we're done */
commit_timestamp = ostree_commit_get_timestamp (commit);
- if (commit_timestamp < ts.tv_sec)
+ /* Is this commit newer than our --keep-younger-than spec? */
+ if (commit_timestamp >= ts->tv_sec)
{
- if (opt_static_deltas_only)
- {
- if(!ostree_repo_prune_static_deltas (repo, checksum, cancellable, error))
- goto out;
- }
+ /* It's newer, traverse it */
+ if (!ostree_repo_traverse_commit_union (repo, next_checksum, 0, reachable,
+ cancellable, error))
+ return FALSE;
+
+ g_free (next_checksum);
+ next_checksum = ostree_commit_get_parent (commit);
+ if (next_checksum)
+ g_clear_pointer (&commit, (GDestroyNotify)g_variant_unref);
else
- {
- if (!ostree_repo_delete_object (repo, OSTREE_OBJECT_TYPE_COMMIT, checksum, cancellable, error))
- goto out;
- }
+ break; /* No parent, we're done */
}
+ else
+ break; /* It's older than our spec, we're done */
}
- ret = TRUE;
-
- out:
- return ret;
+ return TRUE;
}
gboolean
@@ -185,6 +153,9 @@ ostree_builtin_prune (int argc, char **argv, GCancellable *cancellable, GError *
if (!opt_no_prune && !ostree_ensure_repo_writable (repo, error))
goto out;
+ /* Special handling for explicit commit deletion here - we do this
+ * first.
+ */
if (opt_delete_commit)
{
if (opt_no_prune)
@@ -200,26 +171,133 @@ ostree_builtin_prune (int argc, char **argv, GCancellable *cancellable, GError *
else if (!delete_commit (repo, opt_delete_commit, cancellable, error))
goto out;
}
- if (opt_keep_younger_than)
- {
- if (opt_no_prune)
- {
- ot_util_usage_error (context, "Cannot specify both --keep-younger-than and --no-prune", error);
- goto out;
- }
- if (!prune_commits_keep_younger_than_date (repo, opt_keep_younger_than, cancellable, error))
- goto out;
- }
if (opt_refs_only)
pruneflags |= OSTREE_REPO_PRUNE_FLAGS_REFS_ONLY;
if (opt_no_prune)
pruneflags |= OSTREE_REPO_PRUNE_FLAGS_NO_PRUNE;
- if (!ostree_repo_prune (repo, pruneflags, opt_depth,
- &n_objects_total, &n_objects_pruned, &objsize_total,
- cancellable, error))
- goto out;
+ /* If no newer more complex options are specified, drop down to the original
+ * prune API - both to avoid code duplication, and to keep it run from the
+ * test suite.
+ */
+ if (!(opt_retain_branch_depth || opt_keep_younger_than))
+ {
+ if (!ostree_repo_prune (repo, pruneflags, opt_depth,
+ &n_objects_total, &n_objects_pruned, &objsize_total,
+ cancellable, error))
+ goto out;
+ }
+ else
+ {
+ g_autoptr(GHashTable) all_refs = NULL;
+ g_autoptr(GHashTable) reachable = ostree_repo_traverse_new_reachable ();
+ g_autoptr(GHashTable) retain_branch_depth = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+ struct timespec keep_younger_than_ts;
+ GHashTableIter hash_iter;
+ gpointer key, value;
+
+ /* Otherwise, the default is --refs-only; we set this just as a note */
+ opt_refs_only = TRUE;
+
+ if (opt_keep_younger_than)
+ {
+ if (!parse_datetime (&keep_younger_than_ts, opt_keep_younger_than, NULL))
+ {
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+ "Could not parse '%s'", opt_keep_younger_than);
+ goto out;
+ }
+ }
+
+ for (char **iter = opt_retain_branch_depth; iter && *iter; iter++)
+ {
+ /* bd should look like BRANCH=DEPTH where DEPTH is an int */
+ const char *bd = *iter;
+ const char *eq = strchr (bd, '=');
+ const char *depthstr;
+ gint64 depth;
+ char *endptr;
+
+ if (!eq)
+ {
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+ "Invalid value %s, must specify BRANCH=DEPTH",
+ bd);
+ goto out;
+ }
+ depthstr = eq + 1;
+ errno = EPERM;
+ depth = g_ascii_strtoll (depthstr, &endptr, 10);
+ if (depth == 0)
+ {
+ if (errno == EINVAL)
+ {
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+ "Out of range depth %s", depthstr);
+ goto out;
+ }
+ else if (endptr == depthstr)
+ {
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+ "Invalid depth %s", depthstr);
+ goto out;
+ }
+ }
+ g_hash_table_insert (retain_branch_depth, g_strndup (bd, eq - bd),
+ GINT_TO_POINTER ((int)depth));
+ }
+
+ /* We start from the refs */
+ if (!ostree_repo_list_refs (repo, NULL, &all_refs,
+ cancellable, error))
+ return FALSE;
+
+ g_hash_table_iter_init (&hash_iter, all_refs);
+ while (g_hash_table_iter_next (&hash_iter, &key, &value))
+ {
+ const char *checksum = value;
+ gpointer depthp = g_hash_table_lookup (retain_branch_depth, key);
+ gint depth;
+
+ /* Here, we handle a spec like
+ * --retain-branch-depth=myos/x86_64/stable=-1
+ * --retain-branch-depth=myos/x86_64/dev=5
+ */
+ if (depthp)
+ depth = GPOINTER_TO_INT(depthp);
+ else if (opt_keep_younger_than)
+ {
+ if (!traverse_keep_younger_than (repo, checksum,
+ &keep_younger_than_ts,
+ reachable,
+ cancellable, error))
+ goto out;
+
+ /* Okay, we handled the younger-than case; the other
+ * two fall through to plain depth-based handling below.
+ */
+ continue; /* Note again, we're skipping the below bit */
+ }
+ else
+ depth = opt_depth; /* No --retain-branch-depth for this branch, use
+ the global default */
+
+ g_debug ("Finding objects to keep for commit %s", checksum);
+ if (!ostree_repo_traverse_commit_union (repo, checksum, depth, reachable,
+ cancellable, error))
+ return FALSE;
+ }
+
+ { OstreeRepoPruneOptions opts = { pruneflags, reachable };
+ if (!ostree_repo_prune_from_reachable (repo, &opts,
+ &n_objects_total,
+ &n_objects_pruned,
+ &objsize_total,
+ cancellable, error))
+ goto out;
+ }
+ }
formatted_freed_size = g_format_size_full (objsize_total, 0);
diff --git a/src/ostree/ot-builtin-trivial-httpd.c b/src/ostree/ot-builtin-trivial-httpd.c
index 0a553858..206970c5 100644
--- a/src/ostree/ot-builtin-trivial-httpd.c
+++ b/src/ostree/ot-builtin-trivial-httpd.c
@@ -1,6 +1,6 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
*
- * Copyright (C) 2011,2013 Colin Walters Index of %s
\r\n
\r\n",
- (char *)entries->pdata[i],
- (char *)entries->pdata[i]);
- g_free (g_steal_pointer (&entries->pdata[i]));
- }
- g_string_append (listing, "\r\n\r\n");
- out:
- if (local_error)
- g_printerr ("%s\n", local_error->message);
- return listing;
-}
-
-/* Only allow reading files that have o+r, and for directories, o+x.
- * This makes this server relatively safe to use on multiuser
- * machines.
- */
-static gboolean
-is_safe_to_access (struct stat *stbuf)
-{
- /* Only regular files or directores */
- if (!(S_ISREG (stbuf->st_mode) || S_ISDIR (stbuf->st_mode)))
- return FALSE;
- /* Must be o+r */
- if (!(stbuf->st_mode & S_IROTH))
- return FALSE;
- /* For directories, must be o+x */
- if (S_ISDIR (stbuf->st_mode) && !(stbuf->st_mode & S_IXOTH))
- return FALSE;
- return TRUE;
-}
-
-static void
-close_socket (SoupMessage *msg, gpointer user_data)
-{
- SoupSocket *sock = user_data;
- int sockfd;
-
- /* Actually calling soup_socket_disconnect() here would cause
- * us to leak memory, so just shutdown the socket instead.
- */
- sockfd = soup_socket_get_fd (sock);
-#ifdef G_OS_WIN32
- shutdown (sockfd, SD_SEND);
-#else
- shutdown (sockfd, SHUT_WR);
-#endif
-}
-
-static void
-do_get (OtTrivialHttpd *self,
- SoupServer *server,
- SoupMessage *msg,
- const char *path,
- SoupClientContext *context)
-{
- char *slash;
- int ret;
- struct stat stbuf;
-
- httpd_log (self, "serving %s\n", path);
-
- if (opt_expected_cookies)
- {
- GSList *cookies = soup_cookies_from_request (msg);
- GSList *l;
- int i;
-
- for (i = 0 ; opt_expected_cookies[i] != NULL; i++)
- {
- gboolean found = FALSE;
- gchar *k = opt_expected_cookies[i];
- gchar *v = strchr (k, '=') + 1;
-
- for (l = cookies; l != NULL ; l = g_slist_next (l))
- {
- SoupCookie *c = l->data;
-
- if (!strncmp (k, soup_cookie_get_name (c), v - k - 1) &&
- !strcmp (v, soup_cookie_get_value (c)))
- {
- found = TRUE;
- break;
- }
- }
-
- if (!found)
- {
- httpd_log (self, "Expected cookie not found %s\n", k);
- soup_message_set_status (msg, SOUP_STATUS_FORBIDDEN);
- soup_cookies_free (cookies);
- goto out;
- }
- }
- soup_cookies_free (cookies);
- }
-
- if (opt_expected_headers)
- {
- for (int i = 0 ; opt_expected_headers[i] != NULL; i++)
- {
- const gchar *kv = opt_expected_headers[i];
- const gchar *eq = strchr (kv, '=');
-
- g_assert (eq);
-
- {
- g_autofree char *k = g_strndup (kv, eq - kv);
- const gchar *expected_v = eq + 1;
- const gchar *found_v = soup_message_headers_get_one (msg->request_headers, k);
-
- if (!found_v)
- {
- httpd_log (self, "Expected header not found %s\n", k);
- soup_message_set_status (msg, SOUP_STATUS_FORBIDDEN);
- goto out;
- }
- if (strcmp (found_v, expected_v) != 0)
- {
- httpd_log (self, "Expected header %s: %s but found %s\n", k, expected_v, found_v);
- soup_message_set_status (msg, SOUP_STATUS_FORBIDDEN);
- goto out;
- }
- }
- }
- }
-
- if (strstr (path, "../") != NULL)
- {
- soup_message_set_status (msg, SOUP_STATUS_FORBIDDEN);
- goto out;
- }
-
- if (opt_random_500s_percentage > 0 &&
- emitted_random_500s_count < opt_random_500s_max &&
- g_random_int_range (0, 100) < opt_random_500s_percentage)
- {
- emitted_random_500s_count++;
- soup_message_set_status (msg, SOUP_STATUS_INTERNAL_SERVER_ERROR);
- goto out;
- }
-
- while (path[0] == '/')
- path++;
-
- do
- ret = fstatat (self->root_dfd, path, &stbuf, 0);
- while (ret == -1 && errno == EINTR);
- if (ret == -1)
- {
- if (errno == EPERM)
- soup_message_set_status (msg, SOUP_STATUS_FORBIDDEN);
- else if (errno == ENOENT)
- soup_message_set_status (msg, SOUP_STATUS_NOT_FOUND);
- else
- soup_message_set_status (msg, SOUP_STATUS_INTERNAL_SERVER_ERROR);
- goto out;
- }
-
- if (!is_safe_to_access (&stbuf))
- {
- soup_message_set_status (msg, SOUP_STATUS_FORBIDDEN);
- goto out;
- }
-
- if (S_ISDIR (stbuf.st_mode))
- {
- slash = strrchr (path, '/');
- if (!slash || slash[1])
- {
- g_autofree char *redir_uri = NULL;
-
- redir_uri = g_strdup_printf ("%s/", soup_message_get_uri (msg)->path);
- soup_message_set_redirect (msg, SOUP_STATUS_MOVED_PERMANENTLY,
- redir_uri);
- }
- else
- {
- g_autofree char *index_realpath = g_strconcat (path, "/index.html", NULL);
- if (fstatat (self->root_dfd, index_realpath, &stbuf, 0) != -1)
- {
- g_autofree char *index_path = g_strconcat (path, "/index.html", NULL);
- do_get (self, server, msg, index_path, context);
- }
- else
- {
- GString *listing = get_directory_listing (self->root_dfd, path);
- soup_message_set_response (msg, "text/html",
- SOUP_MEMORY_TAKE,
- listing->str, listing->len);
- soup_message_set_status (msg, SOUP_STATUS_OK);
- g_string_free (listing, FALSE);
- }
- }
- }
- else
- {
- if (!S_ISREG (stbuf.st_mode))
- {
- soup_message_set_status (msg, SOUP_STATUS_FORBIDDEN);
- goto out;
- }
-
- if (msg->method == SOUP_METHOD_GET)
- {
- glnx_fd_close int fd = -1;
- g_autoptr(GMappedFile) mapping = NULL;
- gsize buffer_length, file_size;
- SoupRange *ranges;
- int ranges_length;
- gboolean have_ranges;
-
- fd = openat (self->root_dfd, path, O_RDONLY | O_CLOEXEC);
- if (fd < 0)
- {
- soup_message_set_status (msg, SOUP_STATUS_INTERNAL_SERVER_ERROR);
- goto out;
- }
-
- mapping = g_mapped_file_new_from_fd (fd, FALSE, NULL);
- if (!mapping)
- {
- soup_message_set_status (msg, SOUP_STATUS_INTERNAL_SERVER_ERROR);
- goto out;
- }
- (void) close (fd); fd = -1;
-
- file_size = g_mapped_file_get_length (mapping);
- have_ranges = soup_message_headers_get_ranges(msg->request_headers, file_size, &ranges, &ranges_length);
- if (opt_force_ranges && !have_ranges && g_strrstr (path, "/objects") != NULL)
- {
- SoupSocket *sock;
- buffer_length = file_size/2;
- soup_message_headers_set_content_length (msg->response_headers, file_size);
- soup_message_headers_append (msg->response_headers,
- "Connection", "close");
-
- /* soup-message-io will wait for us to add
- * another chunk after the first, to fill out
- * the declared Content-Length. Instead, we
- * forcibly close the socket at that point.
- */
- sock = soup_client_context_get_socket (context);
- g_signal_connect (msg, "wrote-chunk", G_CALLBACK (close_socket), sock);
- }
- else
- buffer_length = file_size;
-
- if (have_ranges)
- {
- if (ranges_length > 0 && ranges[0].start >= file_size)
- {
- soup_message_set_status (msg, SOUP_STATUS_REQUESTED_RANGE_NOT_SATISFIABLE);
- soup_message_headers_free_ranges (msg->request_headers, ranges);
- goto out;
- }
- soup_message_headers_free_ranges (msg->request_headers, ranges);
- }
- if (buffer_length > 0)
- {
- SoupBuffer *buffer;
-
- buffer = soup_buffer_new_with_owner (g_mapped_file_get_contents (mapping),
- buffer_length,
- g_mapped_file_ref (mapping),
- (GDestroyNotify)g_mapped_file_unref);
- soup_message_body_append_buffer (msg->response_body, buffer);
- soup_buffer_free (buffer);
- }
- }
- else /* msg->method == SOUP_METHOD_HEAD */
- {
- g_autofree char *length = NULL;
-
- /* We could just use the same code for both GET and
- * HEAD (soup-message-server-io.c will fix things up).
- * But we'll optimize and avoid the extra I/O.
- */
- length = g_strdup_printf ("%lu", (gulong)stbuf.st_size);
- soup_message_headers_append (msg->response_headers,
- "Content-Length", length);
- }
- soup_message_set_status (msg, SOUP_STATUS_OK);
- }
- out:
- {
- guint status = 0;
- g_autofree gchar *reason = NULL;
-
- g_object_get (msg,
- "status-code", &status,
- "reason-phrase", &reason,
- NULL);
- httpd_log (self, " status: %s (%u)\n", reason, status);
- }
- return;
-}
-
-static void
-httpd_callback (SoupServer *server, SoupMessage *msg,
- const char *path, GHashTable *query,
- SoupClientContext *context, gpointer data)
-{
- OtTrivialHttpd *self = data;
-
- if (msg->method == SOUP_METHOD_GET || msg->method == SOUP_METHOD_HEAD)
- do_get (self, server, msg, path, context);
- else
- soup_message_set_status (msg, SOUP_STATUS_NOT_IMPLEMENTED);
-}
-
-static void
-on_dir_changed (GFileMonitor *mon,
- GFile *file,
- GFile *other,
- GFileMonitorEvent event,
- gpointer user_data)
-{
- OtTrivialHttpd *self = user_data;
-
- if (event == G_FILE_MONITOR_EVENT_DELETED)
- {
- self->running = FALSE;
- g_main_context_wakeup (NULL);
- }
-}
-
gboolean
ostree_builtin_trivial_httpd (int argc, char **argv, GCancellable *cancellable, GError **error)
{
- gboolean ret = FALSE;
- g_autoptr(GOptionContext) context = NULL;
- const char *dirpath;
- OtTrivialHttpd appstruct = { 0, };
- OtTrivialHttpd *app = &appstruct;
- glnx_unref_object SoupServer *server = NULL;
- g_autoptr(GFileMonitor) dirmon = NULL;
+ g_autoptr(GPtrArray) new_argv = g_ptr_array_new ();
- context = g_option_context_new ("[DIR] - Simple webserver");
-
- app->root_dfd = -1;
-
- if (!ostree_option_context_parse (context, options, &argc, &argv, OSTREE_BUILTIN_FLAG_NO_REPO, NULL, cancellable, error))
- goto out;
-
- if (argc > 1)
- dirpath = argv[1];
- else
- dirpath = ".";
-
- if (!glnx_opendirat (AT_FDCWD, dirpath, TRUE, &app->root_dfd, error))
- goto out;
-
- if (!(opt_random_500s_percentage >= 0 && opt_random_500s_percentage <= 99))
- {
- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
- "Invalid --random-500s=%u", opt_random_500s_percentage);
- goto out;
- }
-
- if (opt_log)
- {
- GOutputStream *stream = NULL;
-
- if (g_strcmp0 (opt_log, "-") == 0)
- {
- if (opt_daemonize)
- {
- ot_util_usage_error (context, "Cannot use --log-file=- and --daemonize at the same time", error);
- goto out;
- }
- stream = G_OUTPUT_STREAM (g_unix_output_stream_new (STDOUT_FILENO, FALSE));
- }
- else
- {
- g_autoptr(GFile) log_file;
- GFileOutputStream* log_stream;
-
- log_file = g_file_new_for_path (opt_log);
- log_stream = g_file_create (log_file,
- G_FILE_CREATE_PRIVATE,
- cancellable,
- error);
- if (!log_stream)
- goto out;
- stream = G_OUTPUT_STREAM (log_stream);
- }
-
- app->log = stream;
- }
-
-#if SOUP_CHECK_VERSION(2, 48, 0)
- server = soup_server_new (SOUP_SERVER_SERVER_HEADER, "ostree-httpd ", NULL);
- if (!soup_server_listen_all (server, opt_port, 0, error))
- goto out;
-#else
- server = soup_server_new (SOUP_SERVER_PORT, opt_port,
- SOUP_SERVER_SERVER_HEADER, "ostree-httpd ",
- NULL);
-#endif
-
- soup_server_add_handler (server, NULL, httpd_callback, app, NULL);
- if (opt_port_file)
- {
- g_autofree char *portstr = NULL;
-#if SOUP_CHECK_VERSION(2, 48, 0)
- GSList *listeners = soup_server_get_listeners (server);
- g_autoptr(GSocket) listener = NULL;
- g_autoptr(GSocketAddress) addr = NULL;
-
- g_assert (listeners);
- listener = g_object_ref (listeners->data);
- g_slist_free (listeners);
- listeners = NULL;
- addr = g_socket_get_local_address (listener, error);
- if (!addr)
- goto out;
-
- g_assert (G_IS_INET_SOCKET_ADDRESS (addr));
-
- portstr = g_strdup_printf ("%u\n", g_inet_socket_address_get_port ((GInetSocketAddress*)addr));
-#else
- portstr = g_strdup_printf ("%u\n", soup_server_get_port (server));
-#endif
-
- if (g_strcmp0 ("-", opt_port_file) == 0)
- {
- fputs (portstr, stdout); // not g_print - this must go to stdout, not a handler
- fflush (stdout);
- }
- else if (!g_file_set_contents (opt_port_file, portstr, strlen (portstr), error))
- goto out;
- }
-#if !SOUP_CHECK_VERSION(2, 48, 0)
- soup_server_run_async (server);
-#endif
-
- if (opt_daemonize)
- {
- pid_t pid = fork();
- if (pid == -1)
- {
- int errsv = errno;
- g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errsv),
- g_strerror (errsv));
- goto out;
- }
- else if (pid > 0)
- {
- ret = TRUE;
- goto out;
- }
- /* Child, continue */
- /* Daemonising: close stdout/stderr so $() et al work on us */
- fclose (stdout);
- fclose (stdin);
- }
- else
- {
- /* Since we're used for testing purposes, let's just do this by
- * default. This ensures we exit when our parent does.
- */
- if (prctl (PR_SET_PDEATHSIG, SIGTERM) != 0)
- {
- if (errno != ENOSYS)
- {
- glnx_set_error_from_errno (error);
- goto out;
- }
- }
- }
-
- app->running = TRUE;
- if (opt_autoexit)
- {
- gboolean is_symlink = FALSE;
- g_autoptr(GFile) root = NULL;
- g_autoptr(GFileInfo) info = NULL;
-
- root = g_file_new_for_path (dirpath);
- info = g_file_query_info (root,
- G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK,
- G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
- cancellable, error);
- if (!info)
- goto out;
-
- is_symlink = g_file_info_get_is_symlink (info);
-
- if (is_symlink)
- dirmon = g_file_monitor_file (root, 0, cancellable, error);
- else
- dirmon = g_file_monitor_directory (root, 0, cancellable, error);
-
- if (!dirmon)
- goto out;
- g_signal_connect (dirmon, "changed", G_CALLBACK (on_dir_changed), app);
- }
- httpd_log (app, "serving at root %s\n", dirpath);
- while (app->running)
- g_main_context_iteration (NULL, TRUE);
-
- ret = TRUE;
- out:
- if (app->root_dfd != -1)
- (void) close (app->root_dfd);
- g_clear_object (&app->log);
- return ret;
+ g_ptr_array_add (new_argv, PKGLIBEXECDIR "/ostree-trivial-httpd");
+ for (int i = 1; i < argc; i++)
+ g_ptr_array_add (new_argv, argv[i]);
+ g_ptr_array_add (new_argv, NULL);
+ execvp (new_argv->pdata[0], (char**)new_argv->pdata);
+ /* Fall through on error */
+ glnx_set_error_from_errno (error);
+ return FALSE;
}
diff --git a/tests/admin-test.sh b/tests/admin-test.sh
old mode 100755
new mode 100644
index 76fc8b85..cc06fe6f
--- a/tests/admin-test.sh
+++ b/tests/admin-test.sh
@@ -1,4 +1,5 @@
-#!/bin/bash
+# This file is to be sourced, not executed
+
# Copyright (C) 2011,2014 Colin Walters