diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2005-06-30 14:58:24 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2005-06-30 14:58:24 +0000 |
| commit | dd46cefe9746e79da40ef826c6ec028b254f2fe4 (patch) | |
| tree | a669921e0b0a91c33c0f765718c48916cfa275ed /net/freenx/files/patch-freenx-nxserver | |
| parent | 853583ea7c1fcb67bc52be09d75bf6d3e23d6bc7 (diff) | |
Notes
Diffstat (limited to 'net/freenx/files/patch-freenx-nxserver')
| -rw-r--r-- | net/freenx/files/patch-freenx-nxserver | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/net/freenx/files/patch-freenx-nxserver b/net/freenx/files/patch-freenx-nxserver index 0fb6112053f4..79b5a2333394 100644 --- a/net/freenx/files/patch-freenx-nxserver +++ b/net/freenx/files/patch-freenx-nxserver @@ -1,12 +1,21 @@ ---- freenx-0.3.1/nxserver.orig Sun Mar 13 19:56:34 2005 -+++ freenx-0.3.1/nxserver Mon Mar 28 16:49:04 2005 +--- freenx-0.4.1/nxserver.orig Sat Jun 25 08:26:22 2005 ++++ freenx-0.4.1/nxserver Tue Jun 28 09:38:25 2005 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/local/bin/bash # Free implementation of nxserver components # -@@ -48,7 +48,7 @@ +@@ -27,7 +27,7 @@ + # Reread boot command line; echo last parameter's argument or return false. + getparam(){ + stringinstring "&$1=" "$CMDLINE" || return 1 +-echo "$CMDLINE" | awk "/^$1=/"' { VAL=$2 } END { print VAL }' FS="=" RS="(&|\n)" ++echo "$CMDLINE" | tr "&" "\n" | egrep "^"$1"=" | awk -F= '{ VAL=$2 } END { print VAL }' + return 0 + } + +@@ -46,7 +46,7 @@ passdb_get_crypt_pass() { @@ -15,25 +24,16 @@ } passdb_get_pass() -@@ -697,7 +697,7 @@ - +@@ -836,7 +836,7 @@ + rm -f "$SESS_LOCKFILE" - uniqueid=$(echo $[$RANDOM*$RANDOM] | md5sum | cut -d" " -f1 | tr "[a-z]" "[A-Z]") + uniqueid=$(echo $[$RANDOM*$RANDOM] | md5 | cut -d" " -f1 | tr "[a-z]" "[A-Z]") FULL_PARAMS="user=$USER&userip=$USERIP&uniqueid=$uniqueid&display=$SESS_DISPLAY&$PARAMS" - log "$FULL_PARAMS" + log 6 "$FULL_PARAMS" -@@ -755,7 +755,7 @@ - if [ "$ENCRYPTION" = "1" ] - then - let PROXY_DISPLAY=$SESS_DISPLAY+4000 -- netcat 127.0.0.1 $PROXY_DISPLAY -+ nc 127.0.0.1 $PROXY_DISPLAY - exit 0 - else - echo_x "NX> 1001 Bye." -@@ -953,7 +953,7 @@ +@@ -1091,7 +1091,7 @@ [ ${#CMD_CHUSER} -ge 32 ] && cmd_abort "Error: User $CMD_CHUSER must be shorter than 32 characters." egrep -q "^$CMD_CHUSER:" $NX_ETC_DIR/passwords && cmd_abort "Error: User $CMD_CHUSER already in database." |