X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=0accc45108f7c6ba0c2a3a89595d957d8a566920;hp=cc3fc020370821ff028a2543c354dab4acc08039;hb=33692c33f2effa9620064aec44c6196a8d830d05;hpb=c2396d21b32adec8a94bdae47d66bdc492779775

diff --git a/afs.c b/afs.c
index cc3fc020..0accc451 100644
--- a/afs.c
+++ b/afs.c
@@ -607,14 +607,17 @@ static int com_select_callback(struct afs_callback_arg *aca)
 	if (ret >= 0)
 		goto out;
 	/* ignore subsequent errors (but log them) */
-	para_printf(&aca->pbout, "could not activate %s: %s\n"
-		"switching back to %s\n",
-		arg, para_strerror(-ret), current_mop? current_mop : "dummy");
-	ret = activate_mood_or_playlist(current_mop, &num_admissible);
-	if (ret >= 0)
-		goto out;
-	para_printf(&aca->pbout, "could not activate %s: %s\nswitching to dummy\n",
-		current_mop, para_strerror(-ret));
+	para_printf(&aca->pbout, "could not activate %s\n", arg);
+	if (current_mop) {
+		int ret2;
+		para_printf(&aca->pbout, "switching back to %s\n", current_mop);
+		ret2 = activate_mood_or_playlist(current_mop, &num_admissible);
+		if (ret2 >= 0)
+			goto out;
+		para_printf(&aca->pbout, "could not reactivate %s: %s\n",
+			current_mop, para_strerror(-ret2));
+	}
+	para_printf(&aca->pbout, "activating dummy mood\n");
 	activate_mood_or_playlist(NULL, &num_admissible);
 out:
 	para_printf(&aca->pbout, "activated %s (%d admissible files)\n",
@@ -649,7 +652,7 @@ static int setup_command_socket_or_die(void)
 	ret = create_local_socket(socket_name, 0);
 	if (ret < 0) {
 		ret = create_local_socket(socket_name,
-			S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
+			S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IROTH);
 		if (ret < 0) {
 			PARA_EMERG_LOG("%s: %s\n", para_strerror(-ret),
 				socket_name);