{ "help-commands", no_argument, 0, 'H' },
{ "user", required_argument, 0, 'u' },
{ "password", required_argument, 0, 'p' },
{ "help-commands", no_argument, 0, 'H' },
{ "user", required_argument, 0, 'u' },
{ "password", required_argument, 0, 'p' },
static void cf_reconfigure(char attribute((unused)) **argv) {
/* Re-check configuration for server */
static void cf_reconfigure(char attribute((unused)) **argv) {
/* Re-check configuration for server */
- if(config_read(1)) fatal(0, "cannot read configuration");
+ if(config_read(1, NULL))
+ disorder_fatal(0, "cannot read configuration");
int e;
if((e = xstrtol(&n, argv[1], 0, 10)))
int e;
if((e = xstrtol(&n, argv[1], 0, 10)))
case 'h': help_setup_guest();
case 'r': online_registration = 1; break;
case 'R': online_registration = 0; break;
case 'h': help_setup_guest();
case 'r': online_registration = 1; break;
case 'R': online_registration = 0; break;
if(disorder_adduser(getclient(), "guest", "",
online_registration ? "read,register" : "read"))
exit(EXIT_FAILURE);
if(disorder_adduser(getclient(), "guest", "",
online_registration ? "read,register" : "read"))
exit(EXIT_FAILURE);
if(argv[1]) {
// Read track list from file
if(!(input = fopen(argv[1], "r")))
if(argv[1]) {
// Read track list from file
if(!(input = fopen(argv[1], "r")))
+static void wait_for_root(void) {
+ const char *password;
+
+ while(!trackdb_readable()) {
+ disorder_info("waiting for trackdb...");
+ sleep(1);
+ }
+ trackdb_init(TRACKDB_NO_RECOVER|TRACKDB_NO_UPGRADE);
+ for(;;) {
+ trackdb_open(TRACKDB_READ_ONLY);
+ password = trackdb_get_password("root");
+ trackdb_close();
+ if(password)
+ break;
+ disorder_info("waiting for root user to be created...");
+ sleep(1);
+ }
+ trackdb_deinit(NULL);
+}
+
- int n, i, j, local = 0;
+ int n, i, j, local = 0, wfr = 0;
- if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale");
- if(!setlocale(LC_TIME, "")) fatal(errno, "error calling setlocale");
- while((n = getopt_long(argc, argv, "+hVc:dHlNu:p:", options, 0)) >= 0) {
+ if(!setlocale(LC_CTYPE, "")) disorder_fatal(errno, "error calling setlocale");
+ if(!setlocale(LC_TIME, "")) disorder_fatal(errno, "error calling setlocale");
+ while((n = getopt_long(argc, argv, "+hVc:dHlNu:p:W", options, 0)) >= 0) {
case 'N': config_per_user = 0; break;
case 'u': user = optarg; break;
case 'p': password = optarg; break;
case 'N': config_per_user = 0; break;
case 'u': user = optarg; break;
case 'p': password = optarg; break;
+ /* gcrypt initialization */
+ if(!gcry_check_version(NULL))
+ disorder_fatal(0, "gcry_check_version failed");
+ gcry_control(GCRYCTL_INIT_SECMEM, 0);
+ gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
/* accumulate command args */
while(n < argc) {
if((i = TABLE_FIND(commands, name, argv[n])) < 0)
/* accumulate command args */
while(n < argc) {
if((i = TABLE_FIND(commands, name, argv[n])) < 0)
vector_init(&args);
/* Include the command name in the args, but at element -1, for
* the benefit of subcommand getopt calls */
vector_init(&args);
/* Include the command name in the args, but at element -1, for
* the benefit of subcommand getopt calls */