--- master.c.orig	2008-01-31 05:59:54 UTC
+++ master.c
@@ -53,6 +53,8 @@ struct client
 static struct client *clients;
 /* The pseudo-terminal created for the child process. */
 static struct pty the_pty;
+/* The mode of the socket */
+static mode_t socket_mode;
 
 #ifndef HAVE_FORKPTY
 pid_t forkpty(int *amaster, char *name, struct termios *termp,
@@ -66,6 +68,19 @@ unlink_socket(void)
 	unlink(sockname);
 }
 
+/* Check the actual mode of the socket */
+static void
+check_socket_mode(int has_attached_client)
+{
+	if (has_attached_client && ((socket_mode & 0100) != 0100)) {
+		socket_mode |= 0100;
+		chmod(sockname, socket_mode);
+	} else if (!has_attached_client && ((socket_mode & 0100) == 0100)) {
+		socket_mode &= ~0100;
+		chmod(sockname, socket_mode);
+	}
+}
+
 /* Signal */
 static RETSIGTYPE 
 die(int sig)
@@ -206,7 +221,8 @@ create_socket(char *name)
 		return -1;
 	}
 	/* chmod it to prevent any suprises */
-	if (chmod(name, 0600) < 0)
+	socket_mode = 0600;
+	if (chmod(name, socket_mode) < 0)
 	{
 		close(s);
 		return -1;