Xserver/os/connection.c: If -displayfd and an explicit display port number are…

Xserver/os/connection.c: If -displayfd and an explicit display port number are given, use the explicit display number as a starting point for auto-detecting the next available display number.

Xserver/os/connection.c: If -displayfd and an explicit display port number are…
ec185d7f · Mike Gabriel · f4d7863f · ec185d7f
Commit ec185d7f authored Apr 07, 2017 by Mike Gabriel
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 0 deletions

connection.c nx-X11/programs/Xserver/os/connection.c +11 -0

No files found.
--- a/nx-X11/programs/Xserver/os/connection.c
+++ b/nx-X11/programs/Xserver/os/connection.c
@@ -427,7 +427,11 @@ CreateWellKnownSockets(void)
    if (NoListenAll) {
 	ListenTransCount = 0;
    }
+#ifndef NXAGENT_SERVER
    else if ((displayfd < 0) || explicit_display) {
+#else
+    else if (displayfd < 0) {
+#endif /* ! NXAGENT_SERVER */
        if (TryCreateSocket(atoi(display), &partial) &&
            ListenTransCount >= 1)
            if (!PartialNetwork && partial)
@@ -435,7 +439,14 @@ CreateWellKnownSockets(void)
    }
    else { /* -displayfd and no explicit display number */
 	Bool found = 0;
+#ifdef NXAGENT_SERVER
+	int i_offset = 0;
+	if (explicit_display)
+	     i_offset = atoi(display);
+	for (i = i_offset; i < 65536 - X_TCP_PORT; i++) {
+#else
 	for (i = 0; i < 65536 - X_TCP_PORT; i++) {
+#endif /* NXAGENT_SERVER */
 	    if (TryCreateSocket(i, &partial) && !partial) {
 		found = 1;
 		break;