/*
* This file is part of DisOrder.
- * Copyright (C) 2004-2010 Richard Kettlewell
+ * Copyright (C) 2004-13 Richard Kettlewell
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "common.h"
#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <sys/un.h>
-#include <unistd.h>
+#if HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+#if HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+#if HAVE_SYS_UN_H
+# include <sys/un.h>
+#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#include <errno.h>
-#include <netdb.h>
-#include <pcre.h>
+#if HAVE_NETDB_H
+# include <netdb.h>
+#endif
+#if HAVE_PCRE_H
+# include <pcre.h>
+#endif
#include "log.h"
#include "mem.h"
#include "authhash.h"
#include "client-common.h"
#include "rights.h"
-#include "trackdb.h"
#include "kvp.h"
/** @brief Client handle contents */
int verbose;
/** @brief Last error string */
const char *last;
+ /** @brief Address family */
+ int family;
};
/** @brief Create a new client
disorder_client *c = xmalloc(sizeof (struct disorder_client));
c->verbose = verbose;
+ c->family = -1;
return c;
}
+/** @brief Return the address family used by this client */
+int disorder_client_af(disorder_client *c) {
+ return c->family;
+}
+
/** @brief Read a response line
* @param c Client
* @param rp Where to store response, or NULL (UTF-8)
* 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()
*/
} else if(arg == disorder__list) {
char **list = va_arg(ap, char **);
int nlist = va_arg(ap, int);
+ int n;
if(nlist < 0) {
for(nlist = 0; list[nlist]; ++nlist)
;
}
- for(int n = 0; n < nlist; ++n) {
+ for(n = 0; n < nlist; ++n) {
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));
goto write_error;
xfree(d.vec);
if(has_body) {
+ int n;
if(nbody < 0)
for(nbody = 0; body[nbody]; ++nbody)
;
- for(int n = 0; n < nbody; ++n) {
+ for(n = 0; n < nbody; ++n) {
if(body[n][0] == '.')
if(fputc('.', c->fpout) < 0)
goto write_error;
disorder_error(errno, "error calling socket");
return -1;
}
+ c->family = sa->sa_family;
if(connect(fd, sa, salen) < 0) {
byte_xasprintf((char **)&c->last, "connect: %s", strerror(errno));
disorder_error(errno, "error calling connect");
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";