vbox enhancements
Use encrypted mailbox passwords. Taken from Debian sidvbox-diffs.patch Signed-off-by: Karsten Keil <kkeil@linux-pingi.de>
This commit is contained in:
parent
f9c7fe0ed0
commit
0a8f69d1d9
|
@ -166,7 +166,7 @@ standard.tcl.
|
||||||
this configuration file.
|
this configuration file.
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
/usr/doc/isdnutils/examples/vbox.conf
|
/usr/share/doc/isdnvboxserver/examples/vbox.conf
|
||||||
an example.
|
an example.
|
||||||
|
|
||||||
.SH SEE ALSO
|
.SH SEE ALSO
|
||||||
|
@ -175,3 +175,4 @@ an example.
|
||||||
.SH AUTHOR
|
.SH AUTHOR
|
||||||
This manual page was written by Andreas Jellinghaus <aj@dungeon.inka.de>,
|
This manual page was written by Andreas Jellinghaus <aj@dungeon.inka.de>,
|
||||||
for Debian GNU/Linux and isdn4linux.
|
for Debian GNU/Linux and isdn4linux.
|
||||||
|
Now maintained by Paul Slootman <paul@debian.org>.
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
.\" CHECKIN $Date: 2001/03/01 14:45:07 $
|
.\" CHECKIN $Date: 2001/03/01 14:45:07 $
|
||||||
.TH vbox 5 "@MANDATE@" "ISDN 4 Linux @I4LVERSION@" "Linux System Administration"
|
.TH vbox 5 "@MANDATE@" "ISDN 4 Linux @I4LVERSION@" "Linux System Administration"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
vbox files \- file format
|
vbox \- file format
|
||||||
.SH FORMAT
|
.SH FORMAT
|
||||||
With version 2.0.0 of vbox the recorded files have a new header, that
|
With version 2.0.0 of vbox the recorded files have a new header, that
|
||||||
does not only include compression mode and connection information, but
|
does not only include compression mode and connection information, but
|
||||||
|
|
|
@ -67,9 +67,10 @@ path relative to SPOOLDIR.
|
||||||
this configuration file
|
this configuration file
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.B /usr/doc/isdnutils/examples/vboxd.conf
|
.B /usr/share/doc/isdnvboxserver/examples/vboxd.conf
|
||||||
an example
|
an example
|
||||||
|
|
||||||
.SH AUTHOR
|
.SH AUTHOR
|
||||||
This manual page was written by Andreas Jellinghaus <aj@dungeon.inka.de>,
|
This manual page was written by Andreas Jellinghaus <aj@dungeon.inka.de>,
|
||||||
for Debian GNU/Linux and isdn4linux.
|
for Debian GNU/Linux and isdn4linux.
|
||||||
|
Now maintained by Paul Slootman <paul@debian.org>.
|
||||||
|
|
|
@ -16,6 +16,26 @@ is used by
|
||||||
to send notification of a new voice message via email. It is not meant
|
to send notification of a new voice message via email. It is not meant
|
||||||
to be called directly by any user.
|
to be called directly by any user.
|
||||||
|
|
||||||
|
You can make local modifications to this script by copying it from
|
||||||
|
/usr/sbin/vboxmail to /etc/isdn/vboxmail, and editing the copy there.
|
||||||
|
|
||||||
|
Note that there is an enhanced version of this script available as
|
||||||
|
/usr/share/doc/isdnvboxserver/vboxmail.enhanced . To use it, copy it
|
||||||
|
to /etc/isdn/vboxmail . This enhanced version will send the recorded message
|
||||||
|
as a MIME attachment in the email notification.
|
||||||
|
If lame or xingmp3enc are installed in /usr/local/bin, then the message will
|
||||||
|
be converted to MP3 format; otherwise, it will be sent as a WAV file.
|
||||||
|
For this to work, you also need the following packages installed:
|
||||||
|
.br
|
||||||
|
.B mime-construct sox
|
||||||
|
.br
|
||||||
|
and of course an MP3 encoder if you want MP3 format. Note that the MP3 format
|
||||||
|
will only be 50% smaller (instead of the 90% you might otherwise expect),
|
||||||
|
because of the relatively bad sound quality to begin with (8kHz sampling, mono).
|
||||||
|
If you want to use another MP3 encoder than lame or xingmp3enc, you'll have to
|
||||||
|
make patches to the script. I'll be happy to implement your changes. Send them
|
||||||
|
as a wishlist bug report on isdnvboxserver.
|
||||||
|
|
||||||
.SH SEE ALSO
|
.SH SEE ALSO
|
||||||
.B vboxgetty(8), vboxgetty.conf(5)
|
.B vboxgetty(8), vboxgetty.conf(5)
|
||||||
|
|
||||||
|
|
|
@ -88,7 +88,7 @@ BLACK RED GREEN BROWN BLUE MAGENTA CYAN GREY
|
||||||
.B ~/.vboxrc
|
.B ~/.vboxrc
|
||||||
this configuration file
|
this configuration file
|
||||||
.TP
|
.TP
|
||||||
.B /usr/doc/isdnutils/examples/vboxrc
|
.B /usr/share/doc/isdnvboxclient/examples/vboxrc
|
||||||
an example
|
an example
|
||||||
|
|
||||||
.SH SEE ALSO
|
.SH SEE ALSO
|
||||||
|
@ -97,3 +97,4 @@ an example
|
||||||
.SH AUTHOR
|
.SH AUTHOR
|
||||||
This manual page was written by Andreas Jellinghaus <aj@dungeon.inka.de>,
|
This manual page was written by Andreas Jellinghaus <aj@dungeon.inka.de>,
|
||||||
for Debian GNU/Linux and isdn4linux.
|
for Debian GNU/Linux and isdn4linux.
|
||||||
|
Now maintained by Paul Slootman <paul@debian.org>.
|
||||||
|
|
|
@ -13,7 +13,9 @@ L:*:N
|
||||||
# All hosts in the full access list (begins with 'A') are checked if the
|
# All hosts in the full access list (begins with 'A') are checked if the
|
||||||
# server gets the 'login' command.
|
# server gets the 'login' command.
|
||||||
|
|
||||||
A:localhost:RW:michael:xxx:/var/spool/vbox/michael:incoming
|
# One user in this file can be configured by the `debconf' system, the next one.
|
||||||
A:localhost:RW:nicole:xxx:/var/spool/vbox/nicole:incoming
|
# Remove this comment if you don't want any configuration to happen.
|
||||||
|
A:localhost:RW:username:*invalid*password*:/var/spool/vbox/ttyI6:incoming
|
||||||
|
# A:localhost:RW:nicole:xxx:/var/spool/vbox/nicole:incoming
|
||||||
|
|
||||||
A:*:!:!:!:!:!
|
A:*:!:!:!:!:!
|
||||||
|
|
|
@ -21,17 +21,17 @@ debuglevel FEWIDJ
|
||||||
# Settings for port ttyI6
|
# Settings for port ttyI6
|
||||||
|
|
||||||
port /dev/ttyI6
|
port /dev/ttyI6
|
||||||
modeminit ATZ&B512&E7830022
|
modeminit ATZ&B512&E000000
|
||||||
user nicole
|
user vboxdaemonuser
|
||||||
group users
|
group users
|
||||||
spooldir /var/spool/vbox/nicole
|
spooldir /var/spool/vbox/ttyI6
|
||||||
|
vboxconfig /home/vboxdaemonuser/.vbox.conf
|
||||||
|
|
||||||
# Settings for port ttyI7
|
# Settings for port ttyI7
|
||||||
|
|
||||||
port /dev/ttyI7
|
#port /dev/ttyI7
|
||||||
modeminit ATZ&B512&E7850413
|
# modeminit ATZ&B512&E7850413
|
||||||
user michael
|
# user michael
|
||||||
group users
|
# group users
|
||||||
spooldir /var/spool/vbox/michael
|
# spooldir /var/spool/vbox/michael
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,7 @@ lists.o: $(HEADERS) lists.c
|
||||||
$(CC) $(CFLAGS) -c lists.c
|
$(CC) $(CFLAGS) -c lists.c
|
||||||
|
|
||||||
script.o: $(HEADERS) script.c
|
script.o: $(HEADERS) script.c
|
||||||
$(CC) $(CFLAGS) -DBINDIR='"$(VBOX_BINDIR)"' -c script.c
|
$(CC) $(CFLAGS) -DBINDIR='"$(VBOX_SBINDIR)"' -c script.c
|
||||||
|
|
||||||
voice.o: $(HEADERS) voice.c
|
voice.o: $(HEADERS) voice.c
|
||||||
$(CC) $(CFLAGS) $(VBOX_SUSPEND_DEF) -c voice.c
|
$(CC) $(CFLAGS) $(VBOX_SUSPEND_DEF) -c voice.c
|
||||||
|
@ -149,7 +149,7 @@ vboxbeep: $(VBOXBEEPOBJS)
|
||||||
VBOXDOBJS = vboxd.o streamio.o
|
VBOXDOBJS = vboxd.o streamio.o
|
||||||
|
|
||||||
vboxd: $(VBOXDOBJS)
|
vboxd: $(VBOXDOBJS)
|
||||||
$(CC) $(CFLAGS) $(VBOXDOBJS) -o vboxd -L. -lvbox
|
$(CC) $(CFLAGS) $(VBOXDOBJS) -o vboxd -L. -lvbox -lcrypt
|
||||||
|
|
||||||
distclean: clean
|
distclean: clean
|
||||||
|
|
||||||
|
|
|
@ -6,6 +6,9 @@
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
|
#define _GNU_SOURCE /* for crypt() */
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
#if TIME_WITH_SYS_TIME
|
#if TIME_WITH_SYS_TIME
|
||||||
# include <sys/time.h>
|
# include <sys/time.h>
|
||||||
# include <time.h>
|
# include <time.h>
|
||||||
|
@ -21,7 +24,6 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
#include <fnmatch.h>
|
#include <fnmatch.h>
|
||||||
|
@ -634,7 +636,20 @@ static int check_client_access_login(char *name, char *addr, char *user, char *p
|
||||||
|
|
||||||
if (strcmp(list[4], "-" ) == 0) continue;
|
if (strcmp(list[4], "-" ) == 0) continue;
|
||||||
if (strcmp(list[4], "!" ) == 0) continue;
|
if (strcmp(list[4], "!" ) == 0) continue;
|
||||||
if (strcmp(list[4], pass) != 0) continue;
|
if (strncmp(list[4], "DES ", 4) == 0 && strlen(list[4]) == 17) {
|
||||||
|
/* This is a DES-encrypted password */
|
||||||
|
char salt[3];
|
||||||
|
salt[0] = list[4][4];
|
||||||
|
salt[1] = list[4][5];
|
||||||
|
salt[2] = 0;
|
||||||
|
if (strcmp(&(list[4][4]), crypt(pass, salt)) != 0)
|
||||||
|
continue; /* no match, next line */
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
if (strcmp(list[4], pass) != 0)
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
/* fallthrough case: password accepted */
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue