Imported Upstream version 2.1

parent 04481829
2010-07-07 Sergey Poznyakoff <gray@gnu.org.ua>
Version 2.1
* NEWS, README, THANKS: Update.
* configure.ac: Raise version number.
* lib/Makefile.am (libdico_la_LDFLAGS): Update.
Minor change
* modules/python/python.c: Fix indentation.
Improve mediawiki matching.
* app/python/mediawiki.py (match_word): Use strat selector,
if it is available. Return sorted results. Make sure the
[0] of the result is 'match' (to avoid misinterpreting
eventual match results for the word 'define').
Minor changes
* NEWS: Update.
* modules/template.scm (match-word): Fix definition.
* po/POTFILES.in: Add new files.
* tests/Makefile.am (EXTRA_DIST): Add example.py
2010-07-02 Sergey Poznyakoff <gray@gnu.org.ua>
Version 2.0.92
* configure.ac, NEWS: Version 2.0.92
* doc/dico.texi: Document LDAP.
* dicod/main.c: Minor fix.
Fix typos in debugging messages.
Use encrypted passwords for authentication, if the underlying
GSASL mechanism allows that.
* configure.ac: Cjeck for crypt.h and -lcrypt.
* dicod/ckpass.c: New file.
* dicod/Makefile.am (dicod_SOURCES): Add ckpass.c
* dicod/dicod.h (dicod_check_password): New proto.
* dicod/gsasl.c (cb_validate): Use dicod_check_password
instead of comparing plaintext passwords.
* dicod/ident.c (decode64_buf): Remove.
(ident_decrypt): Use dico_base64_decode.
* dicod/main.c (user_db_config): Don't attempt to
open uninitialized database.
* gnulib.modules: Add crypto/sha1
* include/dico/filter.h (dico_base64_decode)
(dico_base64_encode, dico_base64_input): Change signature.
(dico_qp_decode, dico_qp_encode): Remove.
* lib/base64.c (dico_base64_input): Rewrite.
(dico_base64_decode): Rename to static _flt_base64_decode.
(dico_base64_encode): Rename to static _flt_base64_encode.
(dico_base64_decode,dico_base64_encode): New functions.
* lib/qp.c (dico_qp_decode, dico_qp_encode): Static.
2010-07-01 Sergey Poznyakoff <gray@gnu.org.ua>
Bugfix
* modules/ldap/ldap.c (db_get_groups): Fix typo.
Implement LDAP user database.
* configure.ac: Check for openldap.
* dicod/Makefile.am (dicod_SOURCES): Remove udb.c
* dicod/udb.c: Move to lib (with changes).
* dicod/auth.c: Update calls to dico_udb_ * functions.
* dicod/gsasl.c: Likewise.
* dicod/dbtext.c (dbtext_open): Add 3rd parameter.
(text_udb_def): Change type.
* dicod/dicod.h (udb_def): Remove struct.
(dicod_user_db_t)
(user_db, udb_init, udb_create, udb_open)
(udb_close, udb_get_password, udb_get_groups)
(udp_define): Remove. See dico/udb.h
* dicod/loader.c (dicod_load_module): Minor fix.
* dicod/main.c (user_db): Change data type.
(kwd_user_db): New keyword "options".
(user_db_config): Do not create user database at
once, wait untill the modules have been loaded.
(init_user_db): New function.
(main): Call init_user_db.
* dicod/ostream.c (ostream_write): Remove unused
variable.
* include/dico.h: Include udb.h
* include/dico/Makefile.am (pkginclude_HEADERS): Add udb.h
* lib/Makefile.am (libdico_la_SOURCES): Add udb.c.
* modules/Makefile.am [LDAP_COND] (LDAP_DIR): New variable.
(SUBDIRS): Add LDAP_DIR
* modules/ldap/ldap.c: New file.
* modules/ldap/Makefile.am: New file.
2010-06-30 Sergey Poznyakoff <gray@gnu.org.ua>
Allow the use of an external strategy as the default one.
* dicod/main.c (default_strategy_name): New variable.
(set_defstrat): Remove.
(keywords): Change handling of the default-strategy statement.
(main): Set default strategy after all modules have been loaded,
to allow for using external strategies.
2010-06-29 Sergey Poznyakoff <gray@gnu.org.ua>
Update docs.
2010-06-28 Sergey Poznyakoff <gray@gnu.org.ua>
Minor fix.
* am/gsasl.m4: Use AC_CACHE_VAL instead of AC_CACHE_CHECK.
2010-06-27 Sergey Poznyakoff <gray@gnu.org.ua>
* configure.ac: Distribute bz2 and xz tarballs.
......
......@@ -53,7 +53,7 @@ subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \
INSTALL NEWS README-alpha THANKS TODO build-aux/config.guess \
INSTALL NEWS THANKS TODO build-aux/config.guess \
build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
build-aux/install-sh build-aux/ltmain.sh build-aux/mdate-sh \
build-aux/missing build-aux/texinfo.tex build-aux/ylwrap
......@@ -93,17 +93,17 @@ am__aclocal_m4_deps = $(top_srcdir)/gint/gint.m4 \
$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf.m4 \
$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/quote.m4 \
$(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/realloc.m4 \
$(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/size_max.m4 \
$(top_srcdir)/m4/snprintf.m4 $(top_srcdir)/m4/sockets.m4 \
$(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \
$(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \
$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \
$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strerror.m4 \
$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/string_h.m4 \
$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
$(top_srcdir)/m4/sys_socket_h.m4 \
$(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/sha1.m4 \
$(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/snprintf.m4 \
$(top_srcdir)/m4/sockets.m4 $(top_srcdir)/m4/ssize_t.m4 \
$(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \
$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \
$(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \
$(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strftime.m4 \
$(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strtoimax.m4 \
$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/sys_socket_h.m4 \
$(top_srcdir)/m4/sys_time_h.m4 $(top_srcdir)/m4/sysexits.m4 \
$(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \
$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/unistd_h.m4 \
......
GNU Dico NEWS -- history of user-visible changes. 2010-06-27
GNU Dico NEWS -- history of user-visible changes. 2010-07-07
Copyright (C) 2008, 2009, 2010 Sergey Poznyakoff
See the end of file for copying conditions.
Please send Dico bug reports to <bug-dico@gnu.org.ua>
Version 2.0.91 (GIT)
Version 2.1, 2010-07-07
* Normalize exit codes.
......@@ -13,9 +13,8 @@ The dicod server uses exit codes from sysexits.h.
* Replies to MATCH command.
The dictorg backend filters out any duplicate entries in replies
to MATCH commands. Only the first one from a sequence of such
duplicates is retained.
The dictorg backend filters out duplicate entries from MATCH replies.
Only the first one from a sequence of such duplicates is retained.
* New configuration statements.
......@@ -44,6 +43,18 @@ load-module substr {
command "substr";
}
* LDAP
Dicod now supports LDAP as an underlying mechanism for storing
user databases. The LDAP support is loaded as a module:
load-module ldap {
command "ldap";
}
See the documentation, subsection 3.3.3.2 "LDAP Databases", for
a detailed description.
* Dicoweb
Improved handling of databases without a descriptive name (previous
......@@ -51,8 +62,8 @@ version would throw exception for such cases).
The file settings.py renamed to settings-sample.py.
The file static/opensearch.xml has been moved to the templates. If
you are upgrading from an earlier version, you may remove it.
The file static/opensearch.xml has been moved to templates. If
you are upgrading from an earlier version, you may safely remove it.
* Bugfixes:
** Fixed improper handling of conversion errors in levenshtein.c
......
......@@ -6,12 +6,12 @@ Copyright (C) 2008, 2009, 2010 Sergey Poznyakoff
This file contains brief information about configuring, testing
and running GNU Dico. It is *not* intended as a replacement
for the documentation, it is provided as a brief reference only.
for the documentation, but is provided as a brief reference only.
The (almost) complete documentation for Dico is available in
doc/ subdirectory. To read it without installing the package
run `info -f doc/dico.info'. After the package is installed
the documentation can be accessed running `info Dico'. Invoking
`info dico' and `info dicod' (with lower-case `d') will show you a
`info dico' and `info dicod' (with a lower-case `d') will show you a
concise description of the command line syntax (similar to a man-page
style) of `dico' and `dicod' programs, correspondingly.
......@@ -21,17 +21,22 @@ at http://dico.man.gnu.org.ua.
* Overview
==========
Dico is an implementation of DICT server (RFC 2229). It is fully
modular: the daemon itself (dicod) provides only the server
functionality, but it knows nothing about database formats. Actual
Dico is a flexible implementation of DICT server (RFC 2229). The
server is modular: the daemon itself (dicod) provides only the server
functionality, and knows nothing about database formats. Actual
searches are performed by functions supplied in loadable modules. A
single module can serve one or more databases.
single module can handle any number of database instances.
The package includes several modules for searching in different
dictionary databases, among them a module for dict.org databases and a
module for databases in Emacs "outline" format.
A console client program, `dico', is also included.
The server can be configured to handle both anonymous and authorized
access. It supports a wide variety of authentication algorithms.
Simpler configurations can keep the user database in plaintext files,
while more complex ones can use LDAP.
A console client program, `dico', is included.
A module for lookups in Jim Breen's Kanjidic and Edict databases will
be added in future.
......@@ -42,29 +47,37 @@ be added in future.
Dico is informal French for "Dictionary". It is pronounced "Deekoh",
with the stress on the last syllable.
* Current state
===============
The dicod daemon is completely implemented. It provides all the
functionality required by RFC 2229, including SASL authentication.
* Modules
=========
The package comes with the following database modules:
The package comes with the following modules:
- dictorg
This module handles databases in dict.org format.
This module handles databases in dict.org format.
- guile
An abstract layer for interfacing with database modules written in
Guile.
An abstract layer for interfacing with database modules written in
Guile.
- python
An abstract layer for interfacing with database modules written in
Python.
An abstract layer for interfacing with database modules written in
Python.
- outline
Support for databases in Emacs outline format. This module is
designed mostly as an example and for testing purposes.
Support for databases in Emacs outline format. This module is
designed mostly as an example and for testing purposes.
- substr
Defines the "substr" lookup strategy, which matches a supplied
substring anywhere in the headword.
- stratall
Defines a special lookup strategy, named "all", which returns all
headwords from the database.
- ldap
Brings support for LDAP user databases.
* Building
==========
......@@ -82,34 +95,33 @@ Dico.
------------------------
The runtime configuration system uses `m4' to preprocess the
configuration file. This makes the configuration extremely flexible.
We recommend to use GNU m4 as a preprocessor. However, any other
implementation of `m4' may be used. The `configure' script tries to
determine full file name of the preprocessor binary and the necessary
configuration file, which makes the configuration extremely flexible.
We recommend to use GNU m4 as a preprocessor, although any other
implementation of `m4' can be used as well. The `configure' script tries to
determine the full file name of the preprocessor binary and the necessary
command line options. In case it makes a wrong guess, you can instruct
it to use a particular preprocessor by using `DEFAULT_PREPROCESSOR'
it to use a particular preprocessor by defining the `DEFAULT_PREPROCESSOR'
configuration variable. For example, the following `configure'
invocation instructs it to use `/usr/local/bin/gm4':
$ ./configure DEFAULT_PREPROCESSOR="/usr/local/bin/gm4 -s"
Note the use of `-s' preprocessor option. It instructs `m4' to
Note the use of the `-s' preprocessor option. It tells `m4' to
produce line directives which help `dicod' produce correct diagnostics
about eventual configuration errors. Unless your `m4' implementation
does not have this feature, we recommend to always use it in
`DEFAULT_PREPROCESSOR' value.
Finally, if you do not wish to use preprocessor at all, you can
disable it using `--without-preprocessor' option to `configure'.
Finally, if you do not wish to use preprocessor at all, use
the `--without-preprocessor' option.
** Default Server
-----------------
Unless given an explicit dictionary server, the client program `dico'
attempts to connect the server `dict://dico.gnu.org.ua'. You may
change this default by defining the DEFAULT_DICT_SERVER variable. For
example, the following command line selects dict.org as the default
server:
attempts to connect the server `dict://dico.gnu.org.ua'. You can
change this default by setting the DEFAULT_DICT_SERVER environment
variable to the desired server hostname. For example:
$ ./configure DEFAULT_DICT_SERVER=dict.org
......@@ -129,10 +141,9 @@ If you do not wish to use Guile, use `--without-guile' to disable it.
----------------------------
The `dicod' daemon uses syslog for diagnostics. The default syslog
facility can be set using `LOG_FACILITY' configuration variable. Its
allowed arguments are `user', `daemon', `auth', `authpriv', `mail',
`cron', and `local0' through `local7'. Case is not significant. In
addition, these words can be prefixed with `log_'.
facility can be set using `LOG_FACILITY' configuration variable.
Allowed arguments are `user', `daemon', `auth', `authpriv', `mail',
`cron', and `local0' through `local7' (case insensitive).
By default, the `daemon' facility is used.
......@@ -143,7 +154,7 @@ Send bug reports to <bug-dico@gnu.org>.
* Copyright information:
Copyright (C) 2008, 2009 Sergey Poznyakoff
Copyright (C) 2008, 2009, 2010 Sergey Poznyakoff
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the
......
This file is part of GNU Dico.
See end of file for copying conditions.
* Introduction
This is a *pre-release* version, and not ready for production use yet.
If you are taking source from Git, you will need to have several
special tools to help contribute. See the file README-hacking for more
information. See chapter `Building' for the detailed instructions on
how to build the package.
Please, note that the accompanying documentation may be inaccurate
or incomplete. The ChangeLog file is the authoritative documentation of
all recent changes.
Please, send comments and problem reports to <bug-dico@gnu.org.ua>.
* Checking Out the Sources
The following instructions apply if you wish to obtain sources from
the Git repository:
To clone the GNU Dico repository, issue the following command:
git clone git://git.gnu.org.ua/dico.git
or
git clone http://git.gnu.org.ua/repo/dico.git
This will create a directory named `dico' and populate it with the
sources.
For more information about Git access, visit
http://puszcza.gnu.org.ua/git/?group=dico
* Building
Usual procedures apply:
./configure
make
make install
See the files INSTALL and README for the detailed instructions.
* Copyright information:
Copyright (C) 2008, 2010 Sergey Poznyakoff
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the
copyright notice and this permission notice are preserved,
thus giving the recipient permission to redistribute in turn.
Permission is granted to distribute modified versions
of this document, or of portions of it,
under the above conditions, provided also that they
carry prominent notices stating who last changed them.
Local Variables:
mode: outline
paragraph-separate: "[ ]*$"
version-control: never
End:
......@@ -5,4 +5,5 @@ suggesting various improvements or submitting actual code. Here is a list
of these people. Help us keep it complete and exempt of errors.
Karl Berry <karl@freefriends.org>
Marc Dequènes <duck@duckcorp.org>
Wojciech Polak <polak@gnu.org>
......@@ -1096,6 +1096,7 @@ m4_include([m4/quote.m4])
m4_include([m4/quotearg.m4])
m4_include([m4/realloc.m4])
m4_include([m4/regex.m4])
m4_include([m4/sha1.m4])
m4_include([m4/size_max.m4])
m4_include([m4/snprintf.m4])
m4_include([m4/sockets.m4])
......
......@@ -16,8 +16,7 @@ dnl with GNU Mailutils; if not, write to the Free Software Foundation,
dnl Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
dnl
AC_DEFUN([MU_CHECK_GSASL],
[AC_CACHE_CHECK([whether to use GNU SASL library],
[mu_cv_lib_gsasl],
[AC_CACHE_VAL([mu_cv_lib_gsasl],
[if test "x$mu_cv_lib_gsasl" = x; then
cached=""
mu_cv_lib_gsasl=no
......@@ -37,9 +36,9 @@ AC_DEFUN([MU_CHECK_GSASL],
if test $wantgsasl != no; then
save_LIBS=$LIBS
AC_CHECK_LIB(gsasl, gsasl_init,
[mu_cv_lib_gsasl=-lgsasl],
[mu_cv_lib_gsasl=no])
AC_SEARCH_LIBS(gsasl_init, gsasl,
[mu_cv_lib_gsasl=-lgsasl],
[mu_cv_lib_gsasl=no])
if test $mu_cv_lib_gsasl != no; then
LIBS="$LIBS $mu_cv_lib_gsasl"
AC_TRY_RUN([
......
......@@ -84,7 +84,19 @@ class DicoModule:
req = urllib2.Request (url)
req.add_header ('User-Agent', self.user_agent)
try:
return json.load (urllib2.urlopen (req))
result = json.load (urllib2.urlopen (req))
if result:
if strat.has_selector:
fltres = []
for k in result[1]:
if strat.select (k, key):
fltres.append (k)
if fltres.count > 0:
return ['match', sorted(fltres, key=unicode.lower)]
else:
result[1].sort ()
return ['match', sorted(result[1], key=unicode.lower)]
return False
except urllib2.URLError:
return False
......
......@@ -181,6 +181,9 @@
/* Define to 1 if you have the `closedir' function. */
#undef HAVE_CLOSEDIR
/* Define to 1 if you have the <crypt.h> header file. */
#undef HAVE_CRYPT_H
/* Define to 1 if you have the <db.h> header file. */
#undef HAVE_DB_H
......@@ -188,6 +191,10 @@
*/
#undef HAVE_DCGETTEXT
/* Define to 1 if you have the declaration of `crypt', and to 0 if you don't.
*/
#undef HAVE_DECL_CRYPT
/* Define to 1 if you have the declaration of `cygwin_conv_path', and to 0 if
you don't. */
#undef HAVE_DECL_CYGWIN_CONV_PATH
......@@ -391,6 +398,9 @@
/* Define to 1 if you have the <langinfo.h> header file. */
#undef HAVE_LANGINFO_H
/* Define to 1 if you have the `crypt' library (-lcrypt). */
#undef HAVE_LIBCRYPT
/* Define if you have the libdl library or equivalent. */
#undef HAVE_LIBDL
......@@ -1468,6 +1478,11 @@
#if !HAVE_DECL_CRYPT
char *crypt(const char *key, const char *salt);
#endif
#if defined (SETVBUF_REVERSED)
# define SETVBUF(str,buf,mode,size) setvbuf(str,mode,buf,size)
#else
......
This diff is collapsed.
......@@ -16,7 +16,7 @@ dnl Process this file with -*- autoconf -*- to produce a configure script.
# along with GNU Dico. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.63)
AC_INIT([GNU dico], 2.0.91, [bug-dico@gnu.org])
AC_INIT([GNU dico], 2.1, [bug-dico@gnu.org])
AC_CONFIG_SRCDIR([dicod/main.c])
AM_CONFIG_HEADER(config.h)
AC_CONFIG_AUX_DIR([build-aux])
......@@ -54,7 +54,7 @@ AC_HEADER_DIRENT dnl not needed ?
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/time.h syslog.h unistd.h \
readline/readline.h)
crypt.h readline/readline.h)
dnl Checks for typedefs, structures, and compiler characteristics.
gl_INIT
......@@ -86,6 +86,19 @@ AC_CHECK_FUNCS(gethostname select socket strdup strerror strtol \
setegid setregid setresgid seteuid setreuid \
sysconf getdtablesize)
# Crypt
AC_CHECK_DECLS(crypt,,,[
#include <unistd.h>
#ifdef HAVE_CRYPT_H
# include <crypt.h>
#endif])
AH_BOTTOM([
#if !HAVE_DECL_CRYPT
char *crypt(const char *key, const char *salt);
#endif])
AC_CHECK_LIB(crypt, crypt)
# Gettext.
AM_ICONV
AM_GNU_GETTEXT([external], [need-formatstring-macros])
......@@ -375,6 +388,24 @@ MU_CHECK_GSASL(0.2.5, [
AC_SUBST(BUILD_LIBDICOSASL,'libdicosasl.a')
AC_SUBST(LIBDICOSASL,'../lib/libdicosasl.a')])
# SASL
AC_ARG_WITH(ldap,
[AC_HELP_STRING([--with-ldap],
[Configure to work with OpenLDAP])],
[status_ldap=$withval],
[status_ldap=maybe])
if test $status_ldap != no; then
AC_CHECK_LIB(ldap, ldap_bind,
[status_ldap=yes],
[if test $status_ldap = yes; then
AC_MSG_ERROR([required library ldap is not found])
fi
status_ldap=no])
fi
AM_CONDITIONAL([LDAP_COND], [test $status_ldap = yes])
# Doc hints.
# Select a rendition level:
# DISTRIB for stable releases (at most one dot in the version number)
......@@ -401,6 +432,7 @@ Dico configured with the following settings:
Guile ........................... $status_guile
Python .......................... $status_python
GSASL ........................... $status_gsasl
LDAP ............................ $status_ldap
Readline ........................ $status_readline
Preprocessor .................... $dicopp
......@@ -412,6 +444,7 @@ EOT
[status_guile=$status_guile
status_python=$status_python
status_gsasl=$status_gsasl
status_ldap=$status_ldap
status_readline=$status_readline
if test $use_ext_pp = no; then
dicopp=no
......@@ -437,6 +470,7 @@ AC_CONFIG_FILES([Makefile
modules/python/Makefile
modules/stratall/Makefile
modules/substr/Makefile
modules/ldap/Makefile
dico/Makefile
tests/Makefile
doc/Makefile
......
......@@ -89,17 +89,17 @@ am__aclocal_m4_deps = $(top_srcdir)/gint/gint.m4 \
$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf.m4 \
$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/quote.m4 \
$(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/realloc.m4 \
$(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/size_max.m4 \
$(top_srcdir)/m4/snprintf.m4 $(top_srcdir)/m4/sockets.m4 \
$(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \
$(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \
$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \
$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strerror.m4 \
$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/string_h.m4 \
$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
$(top_srcdir)/m4/sys_socket_h.m4 \
$(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/sha1.m4 \
$(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/snprintf.m4 \
$(top_srcdir)/m4/sockets.m4 $(top_srcdir)/m4/ssize_t.m4 \
$(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \
$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \
$(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \
$(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strftime.m4 \
$(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strtoimax.m4 \
$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/sys_socket_h.m4 \
$(top_srcdir)/m4/sys_time_h.m4 $(top_srcdir)/m4/sysexits.m4 \
$(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \
$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/unistd_h.m4 \
......
......@@ -118,7 +118,7 @@ dict_auth(struct dict_connection *conn, dico_url_t url)
break;
case GETCRED_NOAUTH:
XDICO_DEBUG(1, _("Skipping authenitcation\n"));
XDICO_DEBUG(1, _("Skipping authentication\n"));
break;
}
}
......
......@@ -303,7 +303,7 @@ saslauth(struct dict_connection *conn, dico_url_t url)
break;
case GETCRED_NOAUTH:
XDICO_DEBUG(1, _("Skipping authenitcation\n"));
XDICO_DEBUG(1, _("Skipping authentication\n"));
rc = AUTH_OK;
}
return rc;
......
......@@ -21,6 +21,7 @@ dicod_SOURCES=\
alias.c\
auth.c\
capa.c\
ckpass.c\
cmdline.c\
commands.c\
config-format.c\
......@@ -42,7 +43,6 @@ dicod_SOURCES=\
server.c\
stat.c\
stratcl.c\
udb.c\
xidle.c\
xversion.c
......
......@@ -92,17 +92,17 @@ am__aclocal_m4_deps = $(top_srcdir)/gint/gint.m4 \
$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf.m4 \
$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/quote.m4 \
$(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/realloc.m4 \
$(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/size_max.m4 \
$(top_srcdir)/m4/snprintf.m4 $(top_srcdir)/m4/sockets.m4 \
$(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \
$(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \
$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \
$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strerror.m4 \
$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/string_h.m4 \
$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
$(top_srcdir)/m4/sys_socket_h.m4 \
$(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/sha1.m4 \
$(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/snprintf.m4 \
$(top_srcdir)/m4/sockets.m4 $(top_srcdir)/m4/ssize_t.m4 \
$(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \
$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \
$(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \
$(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strftime.m4 \
$(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strtoimax.m4 \
$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/sys_socket_h.m4 \
$(top_srcdir)/m4/sys_time_h.m4 $(top_srcdir)/m4/sysexits.m4 \
$(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \
$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/unistd_h.m4 \
......@@ -121,14 +121,14 @@ CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(incdir)"
PROGRAMS = $(bin_PROGRAMS)
am_dicod_OBJECTS = accesslog.$(OBJEXT) acl.$(OBJEXT) alias.$(OBJEXT) \
auth.$(OBJEXT) capa.$(OBJEXT) cmdline.$(OBJEXT) \
commands.$(OBJEXT) config-format.$(OBJEXT) \
auth.$(OBJEXT) capa.$(OBJEXT) ckpass.$(OBJEXT) \
cmdline.$(OBJEXT) commands.$(OBJEXT) config-format.$(OBJEXT) \
config-gram.$(OBJEXT) config-lex.$(OBJEXT) dbtext.$(OBJEXT) \
dicod.$(OBJEXT) gsasl.$(OBJEXT) ident.$(OBJEXT) lang.$(OBJEXT) \
lev.$(OBJEXT) loader.$(OBJEXT) main.$(OBJEXT) markup.$(OBJEXT) \
mime.$(OBJEXT) ostream.$(OBJEXT) pp.$(OBJEXT) regex.$(OBJEXT) \
server.$(OBJEXT) stat.$(OBJEXT) stratcl.$(OBJEXT) \
udb.$(OBJEXT) xidle.$(OBJEXT) xversion.$(OBJEXT)
xidle.$(OBJEXT) xversion.$(OBJEXT)
dicod_OBJECTS = $(am_dicod_OBJECTS)
dicod_LDADD = $(LDADD)
dicod_DEPENDENCIES = ../lib/libxdico.a ../gnu/libgnu.a \
......@@ -886,6 +886,7 @@ dicod_SOURCES = \
alias.c\
auth.c\
capa.c\
ckpass.c\
cmdline.c\
commands.c\
config-format.c\
......@@ -907,7 +908,6 @@ dicod_SOURCES = \
server.c\
stat.c\
stratcl.c\
udb.c\
xidle.c\
xversion.c
......@@ -1047,6 +1047,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alias.Po@am__quote@