From e5e777694d9c72539feffd49bd5a4573c26e9750 Mon Sep 17 00:00:00 2001 From: Badlop Date: Tue, 17 Nov 2009 15:49:05 +0000 Subject: [PATCH] Explain that the example captcha.sh requires Bash because uses RANDOM feature. SVN Revision: 2745 --- doc/guide.html | 4 ++-- doc/guide.tex | 4 ++-- tools/captcha.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/guide.html b/doc/guide.html index fdd0414ab..7bd7457e7 100644 --- a/doc/guide.html +++ b/doc/guide.html @@ -351,7 +351,7 @@ GNU Make
  • Erlang pgsql library. Optional. For PostgreSQL authentication or storage. See section 3.2.3.
  • PAM library. Optional. For Pluggable Authentication Modules (PAM). See section 3.1.4.
  • GNU Iconv 1.8 or higher, for the IRC Transport (mod_irc). Optional. Not needed on systems with GNU Libc. See section 3.3.8. -
  • ImageMagick’s Convert program. Optional. For CAPTCHA challenges. See section 3.1.8. +
  • ImageMagick’s Convert program, and Bash. Optional. For CAPTCHA challenges. See section 3.1.8.
  • exmpp 0.9.1 or higher. Optional. For import/export user data with XEP-0227 XML files.

    • 2.4.2  Download Source Code

    @@ -1243,7 +1243,7 @@ In order to take effect there must be a translation file

    3.1.8  CAPTCHA

    Some ejabberd modules can be configured to require a CAPTCHA challenge on certain actions. If the client does not support CAPTCHA Forms (XEP-0158), -a web link is provided so the user can fill the challenge in a web browser.

    An example script is provided that generates the image +a web link is provided so the user can fill the challenge in a web browser.

    An example Bash script is provided that generates the image using ImageMagick’s Convert program.

    The configurable options are:

    {captcha_cmd, Path}
    diff --git a/doc/guide.tex b/doc/guide.tex index f4d5d0843..6a967ae2c 100644 --- a/doc/guide.tex +++ b/doc/guide.tex @@ -315,7 +315,7 @@ To compile \ejabberd{} on a `Unix-like' operating system, you need: \item Erlang pgsql library. Optional. For PostgreSQL authentication or storage. See section \ref{compilepgsql}. \item PAM library. Optional. For Pluggable Authentication Modules (PAM). See section \ref{pam}. \item GNU Iconv 1.8 or higher, for the IRC Transport (mod\_irc). Optional. Not needed on systems with GNU Libc. See section \ref{modirc}. -\item ImageMagick's Convert program. Optional. For CAPTCHA challenges. See section \ref{captcha}. +\item ImageMagick's Convert program, and Bash. Optional. For CAPTCHA challenges. See section \ref{captcha}. \item exmpp 0.9.1 or higher. Optional. For import/export user data with \xepref{0227} XML files. \end{itemize} @@ -1546,7 +1546,7 @@ Some \ejabberd{} modules can be configured to require a CAPTCHA challenge on cer If the client does not support CAPTCHA Forms (\xepref{0158}), a web link is provided so the user can fill the challenge in a web browser. -An example script is provided that generates the image +An example Bash script is provided that generates the image using ImageMagick's Convert program. The configurable options are: diff --git a/tools/captcha.sh b/tools/captcha.sh index 4d405673a..d68edfa03 100755 --- a/tools/captcha.sh +++ b/tools/captcha.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash INPUT=$1