Merge tag 'branchpoint-5.1' into release

[disorder] / lib / client.c

diff --git a/lib/client.c b/lib/client.c
index 6f08fecc5546e38118cefcf7f19b844a33dc1228..55cfe1c838002147e0382a6eac42c0e5a8a5f0cf 100644 (file)
--- a/lib/client.c
+++ b/lib/client.c
@@ -50,7 +50,6 @@
 #include "authhash.h"
 #include "client-common.h"
 #include "rights.h"
 #include "authhash.h"
 #include "client-common.h"
 #include "rights.h"

-#include "trackdb.h"

 #include "kvp.h"
 
 /** @brief Client handle contents */
 #include "kvp.h"
 
 /** @brief Client handle contents */


@@ -176,6 +175,13 @@ static int check_response(disorder_client *c, char **rp) {
  * then the list is assumed to be NULL-terminated.  This may be used
  * any number of times.
  *
  * then the list is assumed to be NULL-terminated.  This may be used
  * any number of times.
  *

+ * Put @ref disorder__integer in the argument list followed by a long to
+ * send its value in decimal.  This may be used any number of times.
+ *
+ * Put @ref disorder__time in the argument list followed by a time_t
+ * to send its value in decimal.  This may be used any number of
+ * times.
+ *

  * Usually you would call this via one of the following interfaces:
  * - disorder_simple()
  */
  * Usually you would call this via one of the following interfaces:
  * - disorder_simple()
  */


@@ -213,6 +219,18 @@ static int disorder_simple_v(disorder_client *c,
          dynstr_append(&d, ' ');
          dynstr_append_string(&d, quoteutf8(arg));
        }
          dynstr_append(&d, ' ');
          dynstr_append_string(&d, quoteutf8(arg));
        }

+      } else if(arg == disorder__integer) {
+       long n = va_arg(ap, long);
+       char buffer[16];
+       snprintf(buffer, sizeof buffer, "%ld", n);
+       dynstr_append(&d, ' ');
+       dynstr_append_string(&d, buffer);
+      } else if(arg == disorder__time) {
+       time_t n = va_arg(ap, time_t);
+       char buffer[16];
+       snprintf(buffer, sizeof buffer, "%lld", (long long)n);
+       dynstr_append(&d, ' ');
+       dynstr_append_string(&d, buffer);

       } else {
        dynstr_append(&d, ' ');
        dynstr_append_string(&d, quoteutf8(arg));
       } else {
        dynstr_append(&d, ' ');
        dynstr_append_string(&d, quoteutf8(arg));


@@ -502,13 +520,13 @@ int disorder_connect(disorder_client *c) {
     return -1;
   }
   password = config->password;
     return -1;
   }
   password = config->password;

-  /* Maybe we can read the database */
-  if(!password && trackdb_readable()) {
-    trackdb_init(TRACKDB_NO_RECOVER|TRACKDB_NO_UPGRADE);
-    trackdb_open(TRACKDB_READ_ONLY);
-    password = trackdb_get_password(username);
-    trackdb_close();
-  }
+  /* If we're connecting as 'root' guess that we're the system root
+   * user (or the jukebox user), both of which can use the privileged
+   * socket.  They can also furtle with the db directly: that is why
+   * privileged socket does not represent a privilege escalation. */
+  if(!password
+     && !strcmp(username, "root"))
+    password = "anything will do for root";

   if(!password) {
     /* Oh well */
     c->last = "no password";
   if(!password) {
     /* Oh well */
     c->last = "no password";