X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/feda7bfaefd9e5fb705d6893f26428a3109e7226..7489d3af05a4394e9621e14a196a9f6c4f788a26:/server/speaker.c diff --git a/server/speaker.c b/server/speaker.c index 5100958..212ffb9 100644 --- a/server/speaker.c +++ b/server/speaker.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2005-2010 Richard Kettlewell + * Copyright (C) 2005-2012 Richard Kettlewell * Portions (C) 2007 Mark Wooding * * This program is free software: you can redistribute it and/or modify @@ -796,8 +796,8 @@ int main(int argc, char **argv) { if(backend->configure) backend->configure(); backend->start(speaker_callback, NULL); - /* create the socket directory */ - byte_xasprintf(&dir, "%s/speaker", config->home); + /* create the private socket directory */ + byte_xasprintf(&dir, "%s/private", config->home); unlink(dir); /* might be a leftover socket */ if(mkdir(dir, 0700) < 0 && errno != EEXIST) disorder_fatal(errno, "error creating %s", dir); @@ -805,7 +805,7 @@ int main(int argc, char **argv) { listenfd = xsocket(PF_UNIX, SOCK_STREAM, 0); memset(&addr, 0, sizeof addr); addr.sun_family = AF_UNIX; - snprintf(addr.sun_path, sizeof addr.sun_path, "%s/speaker/socket", + snprintf(addr.sun_path, sizeof addr.sun_path, "%s/private/speaker", config->home); if(unlink(addr.sun_path) < 0 && errno != ENOENT) disorder_error(errno, "removing %s", addr.sun_path);