From bfc82d910c84b3ad605e9b47d170e297034f47b7 Mon Sep 17 00:00:00 2001 From: Stefan Ritt Date: Wed, 20 Jul 2011 11:53:48 +0000 Subject: [PATCH] Removed old -a -r -w password options from documentation SVN revision: 2421 --- doc/adminguide.html | 10 ---------- man/elogd.8 | 22 +++++----------------- src/elogd.c | 4 ++-- 3 files changed, 7 insertions(+), 29 deletions(-) diff --git a/doc/adminguide.html b/doc/adminguide.html index 79e4a69e..b917f1fa 100755 --- a/doc/adminguide.html +++ b/doc/adminguide.html @@ -302,16 +302,6 @@ option in elogd.cfg to port=80 and restarting e
  • -f <file> specify PID file where elogd process ID is written when server is started
  • -x  enables execution of shell commands
    • - -

    -It may also be used to generate passwords : -

    -

    with : -

    The appearance, functionality and behaviour of the various logbooks on an ELOG server are diff --git a/man/elogd.8 b/man/elogd.8 index 969cf35b..4120ddda 100755 --- a/man/elogd.8 +++ b/man/elogd.8 @@ -19,11 +19,11 @@ elogd \- web server program for Electronic Logbook ELOG .SH SYNOPSIS .sp -\fBelog\fR [ \fB-a \fIpassword\fB\fR ] [ \fB-C \fIurl\fB\fR ] [ \fB-c \fIfile\fB\fR ] +\fBelog\fR [ \fB-C \fIurl\fB\fR ] [ \fB-c \fIfile\fB\fR ] [ \fB-D\fR ] [ \fB-d \fIdirectory\fB\fR ] [ \fB-f \fIfile\fB\fR ] [ \fB-k\fR ] [ \fB-l \fIlogbook\fB\fR ] [ \fB-M\fR ] [ \fB-m\fR ] [ \fB-n \fIhostname\fB\fR ] -[ \fB-p \fIport\fB\fR ] [ \fB-r \fIpassword\fB\fR ] [ \fB-S\fR ] -[ \fB-s \fIdirectory\fB\fR ] [ \fB-v\fR ] [ \fB-w \fIpassword\fB\fR ] [ \fB-x\fR ] +[ \fB-p \fIport\fB\fR ] [ \fB-S\fR ] +[ \fB-s \fIdirectory\fB\fR ] [ \fB-v\fR ] [ \fB-x\fR ] .SH DESCRIPTION .PP @@ -41,9 +41,6 @@ system. .SH OPTIONS \fBelogd\fP accepts the following options: .TP -.BI -a " password" -create/overwrite admin password in config file -.TP .BI -C " url" clone remote elogd configuration .TP @@ -81,9 +78,6 @@ port where .B elogd will run .TP -.BI -r " password" -create/overwrite read password in config file -.TP .BR -S be silent .TP @@ -93,9 +87,6 @@ specify resource directory (eg. themes, icons) .BR -v debugging output .TP -.BI -w " password" -create/overwrite write password in config file -.TP .BR -x enable execution of shell commands (unless compiled with this feature) .SH SEE ALSO @@ -118,12 +109,9 @@ options in configuration file. The configuration and stylesheet files should be readable by that user. .PP Passwords are transferred over the network in plain text and therefore, are not -secure. Although the +secure. So if passwords are used .B elogd -program does not support secure connections over SSL directly, an SSL -encryption wrapper like -.I stunnel -might be used for this purpose. +should be started with the SSL option in the configuration file for secure connections. .SH AUTHOR Written by Stefan Ritt . .PP diff --git a/src/elogd.c b/src/elogd.c index be2d0f33..1db4633f 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -29676,9 +29676,9 @@ int main(int argc, char *argv[]) #endif else { usage:printf("%s\n", ELOGID); - printf("usage: elogd [-a ] [-C ] [-c ] [-D] [-d

    ] "); + printf("usage: elogd [-C ] [-c ] [-D] [-d ] "); printf("[-f ] [-h] [-k] [-l ] [-M] [-m] [-n ] "); - printf("[-p ] [-r ] [-S] [-s ] [-t ] [-v] [-w ] [-x]\n\n"); + printf("[-p ] [-S] [-s ] [-t ] [-v] [-x]\n\n"); printf(" -C clone remote elogd configuration\n"); printf(" -c specify configuration file\n"); printf(" -M synchronize with removing deleted entries\n");