X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=7f27b7dd2653d79a0a7679da3e80d2d9c55e37ac;hp=cc3fc020370821ff028a2543c354dab4acc08039;hb=4d067435b1167dbf5217c875ac9fd7ac69ad91bd;hpb=3fd8d0567ae654aed7e97e832568d3e1b98e20a2

diff --git a/afs.c b/afs.c
index cc3fc020..7f27b7dd 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",
@@ -646,15 +649,10 @@ static int setup_command_socket_or_die(void)
 	char *socket_name = conf.afs_socket_arg;
 
 	unlink(socket_name);
-	ret = create_local_socket(socket_name, 0);
+	ret = create_local_socket(socket_name);
 	if (ret < 0) {
-		ret = create_local_socket(socket_name,
-			S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
-		if (ret < 0) {
-			PARA_EMERG_LOG("%s: %s\n", para_strerror(-ret),
-				socket_name);
-			exit(EXIT_FAILURE);
-		}
+		PARA_EMERG_LOG("%s: %s\n", para_strerror(-ret), socket_name);
+		exit(EXIT_FAILURE);
 	}
 	socket_fd = ret;
 	PARA_INFO_LOG("listening on socket %s (fd %d)\n", socket_name,
@@ -703,7 +701,7 @@ static int open_afs_tables(void)
 	int i, ret;
 
 	get_database_dir();
-	PARA_NOTICE_LOG("opening %u osl tables in %s\n", NUM_AFS_TABLES,
+	PARA_NOTICE_LOG("opening %d osl tables in %s\n", NUM_AFS_TABLES,
 		database_dir);
 	for (i = 0; i < NUM_AFS_TABLES; i++) {
 		ret = afs_tables[i].open(database_dir);
@@ -1021,6 +1019,13 @@ __noreturn void afs_init(uint32_t cookie, int socket_fd)
 	register_command_task(cookie, &s);
 	s.default_timeout.tv_sec = 0;
 	s.default_timeout.tv_usec = 999 * 1000;
+	ret = write(socket_fd, "\0", 1);
+	if (ret != 1) {
+		if (ret == 0)
+			errno = EINVAL;
+		ret = -ERRNO_TO_PARA_ERROR(errno);
+		goto out_close;
+	}
 	ret = schedule(&s);
 	sched_shutdown(&s);
 out_close:
@@ -1192,7 +1197,7 @@ __must_check int afs_event(enum afs_events event, struct para_buffer *pb,
 			continue;
 		ret = t->event_handler(event, pb, data);
 		if (ret < 0) {
-			PARA_CRIT_LOG("table %s, event %d: %s\n", t->name,
+			PARA_CRIT_LOG("table %s, event %u: %s\n", t->name,
 				event, para_strerror(-ret));
 			return ret;
 		}