diff options
| author | Marc G. Fournier <scrappy@FreeBSD.org> | 2006-10-02 12:03:49 +0000 |
|---|---|---|
| committer | Marc G. Fournier <scrappy@FreeBSD.org> | 2006-10-02 12:03:49 +0000 |
| commit | fb0b907994d5a7fbf9107904e44e96b613b678e1 (patch) | |
| tree | f58ebb5097018a94d4343c2377ca2233d04afb08 /sysutils | |
| parent | Update to 1.2.1. (diff) | |
Eliminate initial sleep(s) for getting the id token
Notes
Notes:
svn path=/head/; revision=174303
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/bsdstats/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/bsdstats/files/300.statistics | 25 | ||||
| -rw-r--r-- | sysutils/bsdstats/files/300.statistics.in | 25 |
3 files changed, 11 insertions, 41 deletions
diff --git a/sysutils/bsdstats/Makefile b/sysutils/bsdstats/Makefile index d60ffd257cb2..4ebdd07dc838 100644 --- a/sysutils/bsdstats/Makefile +++ b/sysutils/bsdstats/Makefile @@ -6,7 +6,7 @@ # PORTNAME= bsdstats -PORTVERSION= 4.3 +PORTVERSION= 4.4 CATEGORIES= sysutils DISTFILES= diff --git a/sysutils/bsdstats/files/300.statistics b/sysutils/bsdstats/files/300.statistics index 3f3ee1b31295..deab7ba07f25 100644 --- a/sysutils/bsdstats/files/300.statistics +++ b/sysutils/bsdstats/files/300.statistics @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: /tmp/pcvs/ports/sysutils/bsdstats/files/Attic/300.statistics,v 1.28 2006-10-01 06:15:31 scrappy Exp $ +# $FreeBSD: /tmp/pcvs/ports/sysutils/bsdstats/files/Attic/300.statistics,v 1.29 2006-10-02 12:03:49 scrappy Exp $ # # If there is a global system configuration file, suck it in. @@ -75,7 +75,6 @@ get_id_token () { chown root:wheel $idf && \ chmod 600 $idf - sleep `random` do_fetch getid.php?key=$IDTOKEN | { local IFS IFS='= @@ -98,24 +97,10 @@ get_id_token () { } > $idf && \ mv $idf $id_token_file - if [ ! -s $id_token_file ] ; - then - echo "Nothing returned from $checkin_server" - exit 1 - fi - - echo "To protect against abuse, the initial challenge/response phase" - echo "contains a 15 minute pause. Please be patient while this time" - echo "limit elapses" - sleep 900 - else - FILETIME=$( stat -f %m $id_token_file ) - NOW=$( date +%s ) - if [ $(( $NOW - 900 )) -le $FILETIME ]; then - SLEEPTIME=$(( 900 - ($NOW - $FILETIME) )) - echo "Token key is younger than 15 minutes!" - echo "Sleeping $SLEEPTIME seconds, please wait." - sleep $SLEEPTIME + if [ ! -s $id_token_file ] ; + then + echo "Nothing returned from $checkin_server" + exit 1 fi fi . $id_token_file diff --git a/sysutils/bsdstats/files/300.statistics.in b/sysutils/bsdstats/files/300.statistics.in index 31515c978f5f..39051759f1b3 100644 --- a/sysutils/bsdstats/files/300.statistics.in +++ b/sysutils/bsdstats/files/300.statistics.in @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: /tmp/pcvs/ports/sysutils/bsdstats/files/300.statistics.in,v 1.28 2006-10-01 06:15:31 scrappy Exp $ +# $FreeBSD: /tmp/pcvs/ports/sysutils/bsdstats/files/300.statistics.in,v 1.29 2006-10-02 12:03:49 scrappy Exp $ # # If there is a global system configuration file, suck it in. @@ -75,7 +75,6 @@ get_id_token () { chown root:wheel $idf && \ chmod 600 $idf - sleep `random` do_fetch getid.php?key=$IDTOKEN | { local IFS IFS='= @@ -98,24 +97,10 @@ get_id_token () { } > $idf && \ mv $idf $id_token_file - if [ ! -s $id_token_file ] ; - then - echo "Nothing returned from $checkin_server" - exit 1 - fi - - echo "To protect against abuse, the initial challenge/response phase" - echo "contains a 15 minute pause. Please be patient while this time" - echo "limit elapses" - sleep 900 - else - FILETIME=$( stat -f %m $id_token_file ) - NOW=$( date +%s ) - if [ $(( $NOW - 900 )) -le $FILETIME ]; then - SLEEPTIME=$(( 900 - ($NOW - $FILETIME) )) - echo "Token key is younger than 15 minutes!" - echo "Sleeping $SLEEPTIME seconds, please wait." - sleep $SLEEPTIME + if [ ! -s $id_token_file ] ; + then + echo "Nothing returned from $checkin_server" + exit 1 fi fi . $id_token_file |