[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Muddleftpd-cvs] muddleftpd ./ChangeLog ./Makefile.in ./NEWS ./c...
|
From: |
Joerg Jaspert |
|
Subject: |
[Muddleftpd-cvs] muddleftpd ./ChangeLog ./Makefile.in ./NEWS ./c... |
|
Date: |
Mon, 03 Nov 2003 08:20:18 -0500 |
CVSROOT: /cvsroot/muddleftpd
Module name: muddleftpd
Branch:
Changes by: Joerg Jaspert <address@hidden> 03/11/03 08:20:18
Modified files:
. : ChangeLog Makefile.in NEWS configure.ac
doc : Makefile.in
modules/auth/authlibexample: Makefile.in auth.h
modules/auth/authlibmsql: Makefile.in README auth.h
modules/auth/authlibmud: Makefile.in README auth.h
modules/auth/authlibmysql: Makefile.in README auth.h
configure.ac
modules/auth/authlibsmb: Makefile.in README auth.h
src : Makefile.in
Log message:
Merged changes of 1.3.13 into MAIN
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/ChangeLog.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/Makefile.in.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/NEWS.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/configure.ac.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/doc/Makefile.in.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/modules/auth/authlibexample/Makefile.in.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/modules/auth/authlibexample/auth.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/modules/auth/authlibmsql/Makefile.in.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/modules/auth/authlibmsql/README.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/modules/auth/authlibmsql/auth.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/modules/auth/authlibmud/Makefile.in.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/modules/auth/authlibmud/README.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/modules/auth/authlibmud/auth.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/modules/auth/authlibmysql/Makefile.in.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/modules/auth/authlibmysql/README.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/modules/auth/authlibmysql/auth.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/modules/auth/authlibmysql/configure.ac.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/modules/auth/authlibsmb/Makefile.in.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/modules/auth/authlibsmb/README.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/modules/auth/authlibsmb/auth.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/src/Makefile.in.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: muddleftpd/ChangeLog
diff -c muddleftpd/ChangeLog:1.7 muddleftpd/ChangeLog:1.8
*** muddleftpd/ChangeLog:1.7 Sun Nov 2 08:06:10 2003
--- muddleftpd/ChangeLog Mon Nov 3 08:20:17 2003
***************
*** 1,3 ****
--- 1,36 ----
+ 2003-11-03 Joerg Jaspert <address@hidden>
+
+ * modules/auth: authlibexample/Makefile.in,
+ authlibmud/Makefile.in, authlibsmb/Makefile.in,
+ authlibmysql/Makefile.in, authlibmsql/Makefile.in: Added -fPIC so
+ it actually compiles on different platforms.
+
+ 2003-11-02 Joerg Jaspert <address@hidden>
+
+ * configure.ac, modules/auth/authlibmysql/configure.ac: Changed
+ way we look for mysql. Thats easier for users now.
+
+ * modules/auth/: authlibmsql/auth.h, authlibmysql/auth.h,
+ authlibsmb/auth.h, authlibmud/auth.h, authlibexample/auth.h:
+ Changed include from varargs.h to stdarg.h as gcc no longer
+ includes varargs.h
+
+ * modules/auth/: authlibmsql/README, authlibmysql/README,
+ authlibsmb/README, authlibmud/README, authlibexample/README:
+ Changed documentation to be in sync with new configure/makefile
+ things.
+
+ * modules/auth: authlibmsql/Makefile.in,
+ authlibmysql/Makefile.in, authlibexample/Makefile.in,
+ authlibsmb/Makefile.in, authlibmud/Makefile.in: Change Install
+ Target from TODO to something useful. Install the autlibfile in
+ libdir/muddleftpd set by configure run.
+ Also install the READMEs as README.auth$MODULE in the
+ documentation dir (see below).
+
+ * doc/Makefile.in: Added things to install txt documentation in
+ prefix/share/doc/muddleftpd/*
+
2003-11-02 Beau Kuiper <address@hidden>
* src/ftpd.h: removed headers for string.h since they are in
Index: muddleftpd/Makefile.in
diff -c muddleftpd/Makefile.in:1.4 muddleftpd/Makefile.in:1.5
*** muddleftpd/Makefile.in:1.4 Sun Oct 20 07:51:26 2002
--- muddleftpd/Makefile.in Mon Nov 3 08:20:17 2003
***************
*** 18,30 ****
address@hidden@
# where the binary is stored
! BINDIR=$(prefix)/bin
# where the man pages are stored
! MANDIR=$(prefix)/man
# where info files should be stored
! INFODIR=$(prefix)/info
# directories to make
DIRS=src doc @subdirs@
--- 18,30 ----
address@hidden@
# where the binary is stored
! address@hidden@
# where the man pages are stored
! address@hidden@
# where info files should be stored
! address@hidden@
# directories to make
DIRS=src doc @subdirs@
Index: muddleftpd/NEWS
diff -c muddleftpd/NEWS:1.3 muddleftpd/NEWS:1.4
*** muddleftpd/NEWS:1.3 Sun Nov 2 08:06:10 2003
--- muddleftpd/NEWS Mon Nov 3 08:20:17 2003
***************
*** 3,13 ****
--- 3,17 ----
1) Change: Revamped build system to use new build tools.
2) Change: Included authentication modules into build system.
+ They are installed (if selected at configure time) into
+ the libdir from configure. Normally prefix/lib
+ (/usr/local/lib if not specified).
3) Bug Fix: Properly fixed bug in 1.3.12.1, so muddleftpd does not
accept /r or /n from user input unless it is the form of
a TELNET newline.
4) Bug Fix: Scrambled output on PPC systems fixed. (possibly other
systems too)
+ 5) Change: Install .txt documentation in prefix/share/doc/muddleftpd/*.
Version 1.3.12.1:
***************
*** 957,960 ****
Version 1.0.beta0:
! 1) First Version with CHANGES file.
\ No newline at end of file
--- 961,964 ----
Version 1.0.beta0:
! 1) First Version with CHANGES file.
Index: muddleftpd/configure.ac
diff -c muddleftpd/configure.ac:1.3 muddleftpd/configure.ac:1.4
*** muddleftpd/configure.ac:1.3 Sun Nov 2 08:06:10 2003
--- muddleftpd/configure.ac Mon Nov 3 08:20:17 2003
***************
*** 181,187 ****
AC_ARG_WITH(msqlpath,
AC_HELP_STRING([--with-msqlpath], [specify the top level of the msql
installation tree. (default is /usr/local/Hughes)]),
! mysqltop=$withval, msqltop=/usr/local/Hughes
)
if test "$authmsql" != no; then
--- 181,187 ----
AC_ARG_WITH(msqlpath,
AC_HELP_STRING([--with-msqlpath], [specify the top level of the msql
installation tree. (default is /usr/local/Hughes)]),
! msqltop=$withval, msqltop=/usr/local/Hughes
)
if test "$authmsql" != no; then
***************
*** 190,204 ****
fi
# MYSQL module
! AC_ARG_WITH(authmysql,
! AC_HELP_STRING([--with-authmysql], [create MySQL authentication module.
(no)]),
! authmysql=$withval, authmysql=no
! )
!
! AC_ARG_WITH(mysqlpath,
! AC_HELP_STRING([--with-mysqlpath], [specify the top level of the MySQL
installation tree. (default is /usr/local/Hughes)]),
! mysqltop=$withval, mysqltop=/usr/local/mysql
! )
if test "$authmysql" != no; then
AC_CONFIG_SUBDIRS(modules/auth/authlibmysql)
--- 190,199 ----
fi
# MYSQL module
! AC_ARG_WITH(authmysql,
! AC_HELP_STRING([--with-authmysql=DIR], [creates MySQL authentication
module, optionally specifies the DIR of mysql files]),
! [authmysql="$withval"],
! [authmysql=no])
if test "$authmysql" != no; then
AC_CONFIG_SUBDIRS(modules/auth/authlibmysql)
Index: muddleftpd/doc/Makefile.in
diff -c muddleftpd/doc/Makefile.in:1.3 muddleftpd/doc/Makefile.in:1.4
*** muddleftpd/doc/Makefile.in:1.3 Thu Oct 24 10:20:41 2002
--- muddleftpd/doc/Makefile.in Mon Nov 3 08:20:17 2003
***************
*** 23,28 ****
--- 23,29 ----
# where info files should be stored
address@hidden@
+ address@hidden@
DOCSRC = info/muddleftpd.texi
DOCTARGET =
***************
*** 44,50 ****
doc:
echo There is no makeinfo on this machine
endif
!
install: all
mkdir -p $(MANDIR)/man1
install man/muddleftpd.1 -m 644 $(MANDIR)/man1/$(MUDOUTPROG).1
--- 45,51 ----
doc:
echo There is no makeinfo on this machine
endif
!
install: all
mkdir -p $(MANDIR)/man1
install man/muddleftpd.1 -m 644 $(MANDIR)/man1/$(MUDOUTPROG).1
***************
*** 52,62 ****
install man/mudpasswd.1 -m 644 $(MANDIR)/man1/$(MUDPASSWDPROG).1
mkdir -p $(INFODIR)
install $(DOCOBJ) -m 644 $(INFODIR)
clean:
distclean: clean
rm -f Makefile *~
!
maintainer-clean: distclean
rm -f $(DOCOBJ)
--- 53,70 ----
install man/mudpasswd.1 -m 644 $(MANDIR)/man1/$(MUDPASSWDPROG).1
mkdir -p $(INFODIR)
install $(DOCOBJ) -m 644 $(INFODIR)
+ mkdir -p $(DOCDIR)/doc/muddleftpd
+ install -m 644 cookie.txt $(DOCDIR)/doc/muddleftpd/cookie.txt
+ install -m 644 ftpcmds.txt $(DOCDIR)/doc/muddleftpd/ftpcmds.txt
+ install -m 644 muddleftpd.txt $(DOCDIR)/doc/muddleftpd/muddleftpd.txt
+ install -m 644 mudlogd.txt $(DOCDIR)/doc/muddleftpd/mudlogd.txt
+ install -m 644 mudpasswd.txt $(DOCDIR)/doc/muddleftpd/mudpasswd.txt
+ install -m 644 reference.txt $(DOCDIR)/doc/muddleftpd/reference.txt
clean:
distclean: clean
rm -f Makefile *~
!
maintainer-clean: distclean
rm -f $(DOCOBJ)
Index: muddleftpd/modules/auth/authlibexample/Makefile.in
diff -c muddleftpd/modules/auth/authlibexample/Makefile.in:1.1
muddleftpd/modules/auth/authlibexample/Makefile.in:1.2
*** muddleftpd/modules/auth/authlibexample/Makefile.in:1.1 Sun Oct 20
08:00:41 2002
--- muddleftpd/modules/auth/authlibexample/Makefile.in Mon Nov 3 08:20:17 2003
***************
*** 7,23 ****
SRC=authunix.c
OBJ=$(SRC:.c=.o)
LIBNAME=libauthunix.so
all: $(OBJ)
! $(CC) $(CFLAGS) $(LIBS) -shared -Xlinker -x -o $(LIBNAME) $(OBJ)
clean:
rm -fr autom4te.cache
rm -f *.o *~ DEADJOE $(LIBNAME)
! install:
! echo TODO
distclean: clean
rm -f config.h Makefile config.log config.cache config.status
--- 7,33 ----
SRC=authunix.c
OBJ=$(SRC:.c=.o)
+ address@hidden@
+ address@hidden@
+
+ address@hidden@/muddleftpd
LIBNAME=libauthunix.so
+ address@hidden@
all: $(OBJ)
! $(CC) $(CFLAGS) $(LIBS) -shared -fPIC -Xlinker -x -o $(LIBNAME) $(OBJ)
clean:
rm -fr autom4te.cache
rm -f *.o *~ DEADJOE $(LIBNAME)
! install: all
! mkdir -p $(libdir)
! mkdir -p $(DOCDIR)/doc/muddleftpd
!
! install README -m 644 $(DOCDIR)/doc/muddleftpd/README.authexample
! install $(LIBNAME) -m 644 $(libdir)
!
distclean: clean
rm -f config.h Makefile config.log config.cache config.status
Index: muddleftpd/modules/auth/authlibexample/auth.h
diff -c muddleftpd/modules/auth/authlibexample/auth.h:1.1
muddleftpd/modules/auth/authlibexample/auth.h:1.2
*** muddleftpd/modules/auth/authlibexample/auth.h:1.1 Sun Oct 20 08:00:41 2002
--- muddleftpd/modules/auth/authlibexample/auth.h Mon Nov 3 08:20:17 2003
***************
*** 19,25 ****
#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
! #include <varargs.h>
#ifndef INT_MAX
#define INT_MAX 0x7FFFFFFF
--- 19,25 ----
#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
! #include <stdarg.h>
#ifndef INT_MAX
#define INT_MAX 0x7FFFFFFF
Index: muddleftpd/modules/auth/authlibmsql/Makefile.in
diff -c muddleftpd/modules/auth/authlibmsql/Makefile.in:1.1
muddleftpd/modules/auth/authlibmsql/Makefile.in:1.2
*** muddleftpd/modules/auth/authlibmsql/Makefile.in:1.1 Sun Oct 20 08:00:41 2002
--- muddleftpd/modules/auth/authlibmsql/Makefile.in Mon Nov 3 08:20:17 2003
***************
*** 3,19 ****
address@hidden@
address@hidden@
address@hidden@
!
SRC=authmsql.c
OBJ=$(SRC:.c=.o)
LIBNAME=libauthmsql.so
all: $(OBJ)
! $(CC) $(CFLAGS) -shared -Xlinker -x -o $(LIBNAME) $(OBJ) $(LIBS)
- install:
- @echo TODO
clean:
rm -f *.o *~ DEADJOE $(LIBNAME)
--- 3,29 ----
address@hidden@
address@hidden@
address@hidden@
!
SRC=authmsql.c
OBJ=$(SRC:.c=.o)
+ address@hidden@
+ address@hidden@
+
+ address@hidden@/muddleftpd
LIBNAME=libauthmsql.so
+ address@hidden@
all: $(OBJ)
! $(CC) $(CFLAGS) -shared -fPIC -Xlinker -x -o $(LIBNAME) $(OBJ) $(LIBS)
!
! install: all
! mkdir -p $(libdir)
! mkdir -p $(DOCDIR)/doc/muddleftpd
!
! install README -m 644 $(DOCDIR)/doc/muddleftpd/README.authmsql
! install $(LIBNAME) -m 644 $(libdir)
clean:
rm -f *.o *~ DEADJOE $(LIBNAME)
Index: muddleftpd/modules/auth/authlibmsql/README
diff -c muddleftpd/modules/auth/authlibmsql/README:1.2
muddleftpd/modules/auth/authlibmsql/README:1.3
*** muddleftpd/modules/auth/authlibmsql/README:1.2 Sun Oct 20 11:36:13 2002
--- muddleftpd/modules/auth/authlibmsql/README Mon Nov 3 08:20:17 2003
***************
*** 37,59 ****
./configure [--with-msql=<msqldir>]
make
If mSQL is not installed in the default location (/usr/local/Hughes), you
need to supply the --with-msql option with the path to the base directory
of your mSQL setup.
After you have run make, the file libauthmsql.so can be copied to the
directory you wish to store muddleftpd modules in. This directory must be
! secure, so users cannot overwrite the module with a cracked version. A good
! suggestion would be to store it in the same dir as the muddleftpd server
! config files, typically /etc/muddleftpd.
USAGE:
In the groups that you wish authlibmsql to authenticate, you need to use
the following to tell muddleftpd to use the authlibmsql module, replacing the
directory here with the directory the authentication module is stored in:
! authmethod /etc/muddleftpd/libauthmsql.so
To configure authlibmsql, the following directives have been added. You must
specify these in the group section that is being configured.
--- 37,62 ----
./configure [--with-msql=<msqldir>]
make
+ Or simply build it with the rest of muddleftpd, add --with-authmsql to
+ the configuration options of that configure script.
If mSQL is not installed in the default location (/usr/local/Hughes), you
need to supply the --with-msql option with the path to the base directory
of your mSQL setup.
After you have run make, the file libauthmsql.so can be copied to the
directory you wish to store muddleftpd modules in. This directory must be
! secure, so users cannot overwrite the module with a cracked version.
! By default it is put into @prefix@/lib from configure, if you dont set
! prefix this is /usr/local/lib/muddleftpd.
USAGE:
In the groups that you wish authlibmsql to authenticate, you need to use
the following to tell muddleftpd to use the authlibmsql module, replacing the
directory here with the directory the authentication module is stored in:
+ (If unsure a locate libauthmsql.so may help).
! authmethod /usr/local/lib/muddleftpd/libauthmsql.so
To configure authlibmsql, the following directives have been added. You must
specify these in the group section that is being configured.
Index: muddleftpd/modules/auth/authlibmsql/auth.h
diff -c muddleftpd/modules/auth/authlibmsql/auth.h:1.1
muddleftpd/modules/auth/authlibmsql/auth.h:1.2
*** muddleftpd/modules/auth/authlibmsql/auth.h:1.1 Sun Oct 20 08:00:41 2002
--- muddleftpd/modules/auth/authlibmsql/auth.h Mon Nov 3 08:20:17 2003
***************
*** 19,25 ****
#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
! #include <varargs.h>
#ifndef INT_MAX
#define INT_MAX 0x7FFFFFFF
--- 19,25 ----
#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
! #include <stdarg.h>
#ifndef INT_MAX
#define INT_MAX 0x7FFFFFFF
Index: muddleftpd/modules/auth/authlibmud/Makefile.in
diff -c muddleftpd/modules/auth/authlibmud/Makefile.in:1.1
muddleftpd/modules/auth/authlibmud/Makefile.in:1.2
*** muddleftpd/modules/auth/authlibmud/Makefile.in:1.1 Sun Oct 20 08:00:41 2002
--- muddleftpd/modules/auth/authlibmud/Makefile.in Mon Nov 3 08:20:17 2003
***************
*** 7,19 ****
SRC=authmud.c
OBJ=$(SRC:.c=.o)
LIBNAME=libauthmud.so
all: $(OBJ)
! $(CC) $(CFLAGS) $(LIBS) -shared -Xlinker -x -o $(LIBNAME) $(OBJ)
! install:
! @echo TODO
clean:
rm -fr autom4te.cache
--- 7,28 ----
SRC=authmud.c
OBJ=$(SRC:.c=.o)
+ address@hidden@
+ address@hidden@
+
+ address@hidden@/muddleftpd
LIBNAME=libauthmud.so
+ address@hidden@
all: $(OBJ)
! $(CC) $(CFLAGS) $(LIBS) -shared -fPIC -Xlinker -x -o $(LIBNAME) $(OBJ)
!
! install: all
! mkdir -p $(libdir)
! mkdir -p $(DOCDIR)/doc/muddleftpd
! install README -m 644 $(DOCDIR)/doc/muddleftpd/README.authmud
! install $(LIBNAME) -m 644 $(libdir)
clean:
rm -fr autom4te.cache
Index: muddleftpd/modules/auth/authlibmud/README
diff -c muddleftpd/modules/auth/authlibmud/README:1.1
muddleftpd/modules/auth/authlibmud/README:1.2
*** muddleftpd/modules/auth/authlibmud/README:1.1 Sun Oct 20 08:00:41 2002
--- muddleftpd/modules/auth/authlibmud/README Mon Nov 3 08:20:17 2003
***************
*** 33,51 ****
./configure
make
Then the file libauthmud.so can be copied to the directory you with to
store muddleftpd modules in. This directory must be secure, so users cannot
! overwrite the module with a cracked version. A good suggestion would be to
! store it in the same dir as the muddleftpd server config files, typically
! /etc/muddleftpd
USAGE:
In the groups that you wish authlibmud to authenticate, you need to use
the following to tell muddleftpd to use the authlibmud module, replacing the
directory with the directory the authentication module is stored in:
! authmethod /etc/muddleftpd/libauthmud.so
To configure libauthmud, the following directives have been added. You must
specify these in the group section that is being configured.
--- 33,54 ----
./configure
make
+ Or simply build it with the rest of muddleftpd, add --with-authmud to
+ the configuration options of that configure script.
Then the file libauthmud.so can be copied to the directory you with to
store muddleftpd modules in. This directory must be secure, so users cannot
! overwrite the module with a cracked version. By default it is put into
! @prefix@/lib from configure, if you dont set prefix this is
! /usr/local/lib/muddleftpd.
USAGE:
In the groups that you wish authlibmud to authenticate, you need to use
the following to tell muddleftpd to use the authlibmud module, replacing the
directory with the directory the authentication module is stored in:
+ (If unsure a locate libauthmud.so may help).
! authmethod /usr/local/lib/muddleftpd/libauthmud.so
To configure libauthmud, the following directives have been added. You must
specify these in the group section that is being configured.
Index: muddleftpd/modules/auth/authlibmud/auth.h
diff -c muddleftpd/modules/auth/authlibmud/auth.h:1.1
muddleftpd/modules/auth/authlibmud/auth.h:1.2
*** muddleftpd/modules/auth/authlibmud/auth.h:1.1 Sun Oct 20 08:00:41 2002
--- muddleftpd/modules/auth/authlibmud/auth.h Mon Nov 3 08:20:17 2003
***************
*** 19,25 ****
#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
! #include <varargs.h>
#ifndef INT_MAX
#define INT_MAX 0x7FFFFFFF
--- 19,25 ----
#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
! #include <stdarg.h>
#ifndef INT_MAX
#define INT_MAX 0x7FFFFFFF
Index: muddleftpd/modules/auth/authlibmysql/Makefile.in
diff -c muddleftpd/modules/auth/authlibmysql/Makefile.in:1.1
muddleftpd/modules/auth/authlibmysql/Makefile.in:1.2
*** muddleftpd/modules/auth/authlibmysql/Makefile.in:1.1 Sun Oct 20
08:00:41 2002
--- muddleftpd/modules/auth/authlibmysql/Makefile.in Mon Nov 3 08:20:17 2003
***************
*** 3,26 ****
address@hidden@
address@hidden@
address@hidden@
!
SRC=authmysql.c
OBJ=$(SRC:.c=.o)
LIBNAME=libauthmysql.so
all: $(OBJ)
! $(CC) $(CFLAGS) -shared -Xlinker -o $(LIBNAME) $(OBJ) $(LIBS)
- install:
- @echo TODO
-
clean:
rm -f *.o *~ DEADJOE $(LIBNAME)
distclean: clean
rm -f config.h Makefile config.log config.cache config.status
!
maintainer-clean: distclean
rm -f configure config.h.in
--- 3,36 ----
address@hidden@
address@hidden@
address@hidden@
!
SRC=authmysql.c
OBJ=$(SRC:.c=.o)
+ address@hidden@
+ address@hidden@
+
+ address@hidden@/muddleftpd
LIBNAME=libauthmysql.so
+ address@hidden@
all: $(OBJ)
! $(CC) $(CFLAGS) -shared -fPIC -Xlinker $(OBJ) $(LIBS) -o $(LIBNAME)
!
! install: all
! mkdir -p $(libdir)
! mkdir -p $(DOCDIR)/doc/muddleftpd
!
! install README -m 644 $(DOCDIR)/doc/muddleftpd/README.authmysql
! install $(LIBNAME) -m 644 $(libdir)
!
clean:
rm -f *.o *~ DEADJOE $(LIBNAME)
distclean: clean
rm -f config.h Makefile config.log config.cache config.status
!
maintainer-clean: distclean
rm -f configure config.h.in
Index: muddleftpd/modules/auth/authlibmysql/README
diff -c muddleftpd/modules/auth/authlibmysql/README:1.2
muddleftpd/modules/auth/authlibmysql/README:1.3
*** muddleftpd/modules/auth/authlibmysql/README:1.2 Sun Oct 20 11:36:13 2002
--- muddleftpd/modules/auth/authlibmysql/README Mon Nov 3 08:20:17 2003
***************
*** 34,56 ****
./configure [--with-mysql=<mysqldir>]
make
! If MySQL is not installed in the default location (/usr/local/mysql), you
! need to supply the --with-mysql option with the path to the base directory
! of your MySQL setup.
When you have run make, the file libauthmysql.so can be copied to the
directory you wish to store muddleftpd modules in. This directory must be
! secure, so users cannot overwrite the module with a cracked version. A good
! suggestion would be to store it in the same dir as the muddleftpd server
! config files, typically /etc/muddleftpd.
USAGE:
In the groups that you wish authlibmysql to authenticate, you need to use
the following to tell muddleftpd to use the authlibmysql module, replacing the
directory here with the directory the authentication module is stored in:
! authmethod /etc/muddleftpd/libauthmysql.so
To configure authlibmysql, the following directives have been added. You must
specify these in the group section that is being configured.
--- 34,56 ----
./configure [--with-mysql=<mysqldir>]
make
! Or simply build it with the rest of muddleftpd, add --with-authmysql to
! the configuration options of that configure script.
When you have run make, the file libauthmysql.so can be copied to the
directory you wish to store muddleftpd modules in. This directory must be
! secure, so users cannot overwrite the module with a cracked version.
! By default it is put into @prefix@/lib from configure, if you dont set
! prefix this is /usr/local/lib/muddleftpd.
USAGE:
In the groups that you wish authlibmysql to authenticate, you need to use
the following to tell muddleftpd to use the authlibmysql module, replacing the
directory here with the directory the authentication module is stored in:
+ (If unsure a locate libauthmysql.so may help).
! authmethod /usr/local/lib/muddleftpd/libauthmysql.so
To configure authlibmysql, the following directives have been added. You must
specify these in the group section that is being configured.
Index: muddleftpd/modules/auth/authlibmysql/auth.h
diff -c muddleftpd/modules/auth/authlibmysql/auth.h:1.1
muddleftpd/modules/auth/authlibmysql/auth.h:1.2
*** muddleftpd/modules/auth/authlibmysql/auth.h:1.1 Sun Oct 20 08:00:41 2002
--- muddleftpd/modules/auth/authlibmysql/auth.h Mon Nov 3 08:20:17 2003
***************
*** 19,25 ****
#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
! #include <varargs.h>
#ifndef INT_MAX
#define INT_MAX 0x7FFFFFFF
--- 19,25 ----
#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
! #include <stdarg.h>
#ifndef INT_MAX
#define INT_MAX 0x7FFFFFFF
Index: muddleftpd/modules/auth/authlibmysql/configure.ac
diff -c muddleftpd/modules/auth/authlibmysql/configure.ac:1.1
muddleftpd/modules/auth/authlibmysql/configure.ac:1.2
*** muddleftpd/modules/auth/authlibmysql/configure.ac:1.1 Sun Oct 20
08:00:41 2002
--- muddleftpd/modules/auth/authlibmysql/configure.ac Mon Nov 3 08:20:17 2003
***************
*** 22,49 ****
dnl Check functions
AC_CHECK_FUNCS(memmove)
! AC_ARG_WITH(mysqlpath,
! AC_HELP_STRING([--with-mysqlpath], [specify the top level of the mysql
installation tree. (default is /usr/local/mysql)]),
! mysqltop=$withval, mysqltop=/usr/local/mysql
! )
!
! AC_MSG_CHECKING([for mysql in directory $mysqltop])
!
! if test "X$mysqltop" = "X"
! then
! AC_MSG_RESULT([no])
! AC_MSG_ERROR([msql directory not specified])
! fi
! if test -d $mysqltop
! then
! AC_MSG_RESULT([yes])
! CFLAGS="$CFLAGS -I$mysqltop/include"
! LIBS="$LIBS $mysqltop/lib/libmysqlclient.a"
! else
! AC_MSG_RESULT([no])
! AC_MSG_ERROR([mysql directory not found!])
fi
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
--- 22,137 ----
dnl Check functions
AC_CHECK_FUNCS(memmove)
! default_directory="/usr /usr/local"
!
! AC_DEFUN(FAIL_MESSAGE,[
! echo
! echo
! echo "**********************************************"
! echo " ERROR: unable to find" $1
! echo " checked in the following places"
! for i in `echo $2`; do
! echo " $i"
! done
! echo "**********************************************"
! echo
! exit
! ])
!
! AC_ARG_WITH(authmysql,
! AC_HELP_STRING([--with-authmysql=DIR],[Create MySQL authentication
module, optionally specify dir of mysql files]),
! [ with_mysql="$withval" ],
! [ with_mysql=no ])
!
! if test "$with_mysql" != "no"; then
! if test "$with_mysql" = "yes"; then
! mysql_directory="$default_directory";
! mysql_fail="yes"
! elif test -d $withval; then
! mysql_directory="$withval"
! mysql_fail="no"
! elif test "$with_mysql" = ""; then
! mysql_directory="$default_directory";
! mysql_fail="no"
! fi
!
! AC_MSG_CHECKING(for mysql)
!
! for i in $mysql_directory; do
! if test -r $i/include/mysql/mysql.h; then
! MYSQL_DIR=$i
! MYSQL_INC_DIR=$i/include/mysql
! elif test -r $i/include/mysql.h; then
! MYSQL_DIR=$i
! MYSQL_INC_DIR=$i/include
! fi
! done
!
! if test -z "$MYSQL_DIR"; then
! if test "$mysql_fail" != "no"; then
! tmp=""
! for i in $mysql_directory; do
! tmp="$tmp $i/include $i/include/mysql"
! done
! FAIL_MESSAGE("mysql headers (mysql.h)", $tmp)
! else
! AC_MSG_RESULT(no)
! fi
! else
! for i in lib lib/mysql; do
! str="$MYSQL_DIR/$i/libmysqlclient.*"
! for j in `echo $str`; do
! if test -r $j; then
! MYSQL_LIB_DIR="$MYSQL_DIR/$i"
! break 2
! fi
! done
! done
!
! if test -z "$MYSQL_LIB_DIR"; then
! if test "$mysql_fail" != "no"; then
! FAIL_MESSAGE("mysqlclient library",
! "$MYSQL_DIR/lib $MYSQL_DIR/lib/mysql")
! else
! AC_MSG_RESULT(no)
! fi
! else
! AC_MSG_RESULT(yes)
! CFLAGS="$CFLAGS -I${MYSQL_INC_DIR}"
! LDFLAGS="${LDFLAGS} -L${MYSQL_LIB_DIR}"
! dnl CPPFLAGS="${CPPFLAGS} -I${MYSQL_INC_DIR} -DENABLE_MYSQL"
! LIBS="-lmysqlclient ${LIBS}"
! fi
! fi
fi
+
+ dnl CFLAGS="$CFLAGS -I$mysqltop/include"
+ dnl LIBS="$LIBS $mysqltop/lib/libmysqlclient.a"
+
+
+ dnl AC_ARG_WITH(mysqlpath,
+ dnl AC_HELP_STRING([--with-mysqlpath], [specify the top level of the mysql
installation tree. (default is /usr/local/mysql)]),
+ dnl mysqltop=$withval, mysqltop=/usr/local/mysql
+ dnl )
+
+ dnl AC_MSG_CHECKING([for mysql in directory $mysqltop])
+
+ dnl if test "X$mysqltop" = "X"
+ dnl then
+ dnl AC_MSG_RESULT([no])
+ dnl AC_MSG_ERROR([msql directory not specified])
+ dnl fi
+
+ dnl if test -d $mysqltop
+ dnl then
+ dnl AC_MSG_RESULT([yes])
+ dnl CFLAGS="$CFLAGS -I$mysqltop/include"
+ dnl LIBS="$LIBS $mysqltop/lib/libmysqlclient.a"
+ dnl else
+ dnl AC_MSG_RESULT([no])
+ dnl AC_MSG_ERROR([mysql directory not found!])
+ dnl fi
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
Index: muddleftpd/modules/auth/authlibsmb/Makefile.in
diff -c muddleftpd/modules/auth/authlibsmb/Makefile.in:1.1
muddleftpd/modules/auth/authlibsmb/Makefile.in:1.2
*** muddleftpd/modules/auth/authlibsmb/Makefile.in:1.1 Sun Oct 20 08:00:41 2002
--- muddleftpd/modules/auth/authlibsmb/Makefile.in Mon Nov 3 08:20:17 2003
***************
*** 7,22 ****
SRC=authsmb.c
OBJ=$(SRC:.c=.o)
LIBNAME=libauthsmb.so
all: $(OBJ) smbvalid
! $(CC) $(CFLAGS) $(LIBS) -shared -Xlinker -x -o $(LIBNAME) $(OBJ)
smbval/smbvalid.a
smbvalid:
$(MAKE) -C smbval
! install:
! @echo TODO
clean:
$(MAKE) -C smbval clean
--- 7,32 ----
SRC=authsmb.c
OBJ=$(SRC:.c=.o)
+ address@hidden@
+ address@hidden@
+
+ address@hidden@/muddleftpd
LIBNAME=libauthsmb.so
+ address@hidden@
all: $(OBJ) smbvalid
! $(CC) $(CFLAGS) $(LIBS) -shared -fPIC -Xlinker -x -o $(LIBNAME) $(OBJ)
smbval/smbvalid.a
smbvalid:
$(MAKE) -C smbval
! install: all
! mkdir -p $(libdir)
! mkdir -p $(DOCDIR)/doc/muddleftpd
!
! install README -m 644 $(DOCDIR)/doc/muddleftpd/README.authsmb
! install $(LIBNAME) -m 644 $(libdir)
!
clean:
$(MAKE) -C smbval clean
Index: muddleftpd/modules/auth/authlibsmb/README
diff -c muddleftpd/modules/auth/authlibsmb/README:1.2
muddleftpd/modules/auth/authlibsmb/README:1.3
*** muddleftpd/modules/auth/authlibsmb/README:1.2 Sun Oct 20 11:36:13 2002
--- muddleftpd/modules/auth/authlibsmb/README Mon Nov 3 08:20:17 2003
***************
*** 26,44 ****
./configure
make
Then the file libauthsmb.so can be copied to the directory you with to
store muddleftpd modules in. This directory must be secure, so users cannot
! overwrite the module with a cracked version. A good suggestion would be to
! store it in the same dir as the muddleftpd server config files, typically
! /etc/muddleftpd
USAGE:
In the groups that you wish authlibsmb to authenticate, you need to use
the following to tell muddleftpd to use the authlibsmb module, replacing the
directory with the directory the authentication module is stored in:
! authmodule /etc/muddleftpd/libauthsmb.so
To configure libauthsmb, the following directives have been added. You must
specify these in the group section that is being configured.
--- 26,47 ----
./configure
make
+ Or simply build it with the rest of muddleftpd, add --with-authsmb to
+ the configuration options of that configure script.
Then the file libauthsmb.so can be copied to the directory you with to
store muddleftpd modules in. This directory must be secure, so users cannot
! overwrite the module with a cracked version. By default it is put into
! @prefix@/lib from configure, if you dont set prefix this is
! /usr/local/lib/muddleftpd.
USAGE:
In the groups that you wish authlibsmb to authenticate, you need to use
the following to tell muddleftpd to use the authlibsmb module, replacing the
directory with the directory the authentication module is stored in:
+ (If unsure a locate libauthsmb.so may help).
! authmodule /usr/local/lib/muddleftpd/libauthsmb.so
To configure libauthsmb, the following directives have been added. You must
specify these in the group section that is being configured.
Index: muddleftpd/modules/auth/authlibsmb/auth.h
diff -c muddleftpd/modules/auth/authlibsmb/auth.h:1.1
muddleftpd/modules/auth/authlibsmb/auth.h:1.2
*** muddleftpd/modules/auth/authlibsmb/auth.h:1.1 Sun Oct 20 08:00:41 2002
--- muddleftpd/modules/auth/authlibsmb/auth.h Mon Nov 3 08:20:17 2003
***************
*** 19,25 ****
#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
! #include <varargs.h>
#ifndef INT_MAX
#define INT_MAX 0x7FFFFFFF
--- 19,25 ----
#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
! #include <stdarg.h>
#ifndef INT_MAX
#define INT_MAX 0x7FFFFFFF
Index: muddleftpd/src/Makefile.in
diff -c muddleftpd/src/Makefile.in:1.1 muddleftpd/src/Makefile.in:1.2
*** muddleftpd/src/Makefile.in:1.1 Thu Sep 26 03:55:42 2002
--- muddleftpd/src/Makefile.in Mon Nov 3 08:20:17 2003
***************
*** 100,106 ****
$(MUDLOGD): $(MUDLOGDOBJ)
$(CC) $(CFLAGS) $(LIBS) -o $(MUDLOGD) $(MUDLOGDOBJ)
!
install: all
mkdir -p $(BINDIR)
--- 100,106 ----
$(MUDLOGD): $(MUDLOGDOBJ)
$(CC) $(CFLAGS) $(LIBS) -o $(MUDLOGD) $(MUDLOGDOBJ)
!
install: all
mkdir -p $(BINDIR)
***************
*** 115,119 ****
distclean: clean
rm -f Makefile
!
maintainer-clean: distclean
--- 115,119 ----
distclean: clean
rm -f Makefile
!
maintainer-clean: distclean
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Muddleftpd-cvs] muddleftpd ./ChangeLog ./Makefile.in ./NEWS ./c...,
Joerg Jaspert <=