x11vnc: -DENC_HAVE_OPENSSL=0 to disable enc.h but still

        have ssl. Tweak ps command in find_display. Try to handle
        AIX su. Ignore an initial newline at login: for -unixpw.

1 files changed, 13 insertions, 4 deletions

diff --git a/x11vnc/ssltools.h b/x11vnc/ssltools.h
index 1d0b1ab..1be120f 100644
--- a/x11vnc/ssltools.h
+++ b/x11vnc/ssltools.h
@@ -893,14 +893,23 @@ char find_display[] =
 "\n"
 "# save uname, netstat, and ps output:\n"
 "uname=`uname`\n"
-"nsout=`netstat -an`\n"
+"is_bsd=\"\"\n"
+"if echo \"$uname\" | grep -i bsd > /dev/null; then\n"
+"	is_bsd=1\n"
+"fi\n"
+"\n"
 "if [ \"X$uname\" = \"XDarwin\" ]; then\n"
-"	psout=`ps aux 2>/dev/null | grep -wv PID | grep -v grep`\n"
-"	pslist=`echo \"$psout\" | awk '{print $2}'`\n"
+"	psout=`ps aux 2>/dev/null              | grep -wv PID | grep -v grep`\n"
+"elif [ \"X$uname\" = \"XLinux\" -o \"X$is_bsd\" = \"X1\" ]; then\n"
+"	psout=`ps wwwaux 2>/dev/null           | grep -wv PID | grep -v grep`\n"
+"elif [ \"X$uname\" = \"XSunOS\" -a -x /usr/ucb/ps ]; then\n"
+"	psout=`/usr/ucb/ps wwwaux 2>/dev/null  | grep -wv PID | grep -v grep`\n"
 "else\n"
 "	psout=`ps -ef 2>/dev/null | grep -wv PID | grep -v grep`\n"
-"	pslist=`echo \"$psout\" | awk '{print $2}'`\n"
 "fi\n"
+"pslist=`echo \"$psout\" | awk '{print $2}'`\n"
+"\n"
+"nsout=`netstat -an`\n"
 "\n"
 "rchk() {\n"
 "	rr=rr	\n"