Resolved conflict, indulging new file layout

1 files changed, 12 insertions, 0 deletions

diff --git a/core/slock/config.h b/core/slock/config.h
new file mode 100644
index 0000000..9855e21
--- /dev/null
+++ b/core/slock/config.h
@@ -0,0 +1,12 @@
+/* user and group to drop privileges to */
+static const char *user  = "nobody";
+static const char *group = "nogroup";
+
+static const char *colorname[NUMCOLS] = {
+	[INIT] =   "black",     /* after initialization */
+	[INPUT] =  "#005577",   /* during input */
+	[FAILED] = "#CC3333",   /* wrong password */
+};
+
+/* treat a cleared input like a wrong password (color) */
+static const int failonclear = 1;