* samba/configure.in: More useless stuff removed.

* samba/Makefile.in: Likewise.
* Make-mc.in: Remove samba/smbwrapper directory.
* samba/smbwrapper/smbw.h: Remove.
* samba/include/includes.h: Don't include smbw.h.
This commit is contained in:
Pavel Roskin 2001-02-09 19:31:35 +00:00
parent 2586b393e1
commit 47a538a968
6 changed files with 12 additions and 376 deletions

View File

@ -1,5 +1,11 @@
2001-02-09 Pavel Roskin <proski@gnu.org>
* samba/configure.in: More useless stuff removed.
* samba/Makefile.in: Likewise.
* Make-mc.in: Remove samba/smbwrapper directory.
* samba/smbwrapper/smbw.h: Remove.
* samba/include/includes.h: Don't include smbw.h.
* samba/configure.in: Don't check for things that are unused.
Remove support for building shared libraries.
* samba/Makefile.in: Remove support for shared libraries and

View File

@ -10,7 +10,7 @@ top_builddir = ..
@MCF@
SAMBA_INCLUDES = -I$(srcdir)/samba/ubiqx -I$(srcdir)/samba/smbwrapper
SAMBA_INCLUDES = -I$(srcdir)/samba/ubiqx
CFLAGS = $(XCFLAGS)
CPPFLAGS = $(XCPPFLAGS) -I. $(SAMBA_INCLUDES)
@ -135,9 +135,6 @@ SAMBA_DIST_PARAM = \
loadparm.c \
params.c
SAMBA_DIST_SMBWRAPPER = \
smbw.h
SAMBA_DIST_TESTS = \
README \
crypttest.c \
@ -308,7 +305,6 @@ distdir:
mkdir $(distdir)/samba/lib
mkdir $(distdir)/samba/libsmb
mkdir $(distdir)/samba/param
mkdir $(distdir)/samba/smbwrapper
mkdir $(distdir)/samba/tests
mkdir $(distdir)/samba/ubiqx
for I in $(SAMBA_DIST_TOPLEVEL); do \
@ -326,9 +322,6 @@ distdir:
for I in $(SAMBA_DIST_PARAM); do \
cp -p $(srcdir)/samba/param/$$I $(distdir)/samba/param \
|| exit 1; done
for I in $(SAMBA_DIST_SMBWRAPPER); do \
cp -p $(srcdir)/samba/smbwrapper/$$I $(distdir)/samba/smbwrapper \
|| exit 1; done
for I in $(SAMBA_DIST_TESTS); do \
cp -p $(srcdir)/samba/tests/$$I $(distdir)/samba/tests \
|| exit 1; done

View File

@ -65,7 +65,7 @@ SMBRUN = $(BINDIR)/smbrun
PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\"
FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DSMBLOGFILE=\"$(SMBLOGFILE)\" -DNMBLOGFILE=\"$(NMBLOGFILE)\"
FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx $(CPPFLAGS) -DSMBLOGFILE=\"$(SMBLOGFILE)\" -DNMBLOGFILE=\"$(NMBLOGFILE)\"
FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\"
FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\"
@ -73,11 +73,6 @@ FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H
FLAGS = $(ISA) $(FLAGS5) $(PASSWD_FLAGS)
FLAGS32 = $(ISA32) $(FLAGS5) $(PASSWD_FLAGS)
PROGS1 = bin/smbclient bin/testparm bin/testprns bin/smbstatus @RUNPROG@
PROGS2 = bin/rpcclient bin/smbpasswd bin/make_smbcodepage @WRAP@ @WRAP32@
MPROGS = @MPROGS@
PROGS = $(PROGS1) $(PROGS2) $(MPROGS) bin/nmblookup bin/make_printerdef
SCRIPTS = $(srcdir)/script/smbtar $(srcdir)/script/addtosmbpass $(srcdir)/script/convert_smbpasswd
######################################################################
@ -163,9 +158,6 @@ PRINTING_OBJ = printing/pcap.o printing/print_svid.o printing/printing.o
SMBRUN_OBJ = utils/smbrun.o lib/util_sec.o
SMBSH_OBJ = smbwrapper/smbsh.o smbwrapper/shared.o \
$(PARAM_OBJ) $(UBIQX_OBJ) $(LIB_OBJ)
MAKE_SMBCODEPAGE_OBJ = utils/make_smbcodepage.o $(PARAM_OBJ) \
$(UBIQX_OBJ) $(LIB_OBJ)
@ -195,12 +187,6 @@ RPCCLIENT_OBJ = rpcclient/rpcclient.o \
$(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) $(LIB_OBJ) \
$(RPC_CLIENT_OBJ) $(RPC_PARSE_OBJ) $(PASSDB_OBJ)
SMBWRAPPER_OBJ = smbwrapper/smbw.o smbwrapper/wrapped.o \
smbwrapper/smbw_dir.o smbwrapper/smbw_stat.o \
smbwrapper/realcalls.o smbwrapper/shared.o \
$(LIBSMB_OBJ) $(PARAM_OBJ) \
$(UBIQX_OBJ) $(LIB_OBJ)
CLIENT_OBJ = client/client.o client/clitar.o \
$(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) $(LIB_OBJ)
@ -235,7 +221,7 @@ SMBFILTER_OBJ = utils/smbfilter.o $(LIBSMB_OBJ) $(PARAM_OBJ) \
$(UBIQX_OBJ) $(LIB_OBJ)
PROTO_OBJ = $(CLIENT_OBJ) \
$(RPCCLIENT_OBJ) $(SMBWRAPPER_OBJ) $(SMBTORTURE_OBJ)
$(RPCCLIENT_OBJ) $(SMBTORTURE_OBJ)
######################################################################
# now the rules...
@ -243,16 +229,6 @@ PROTO_OBJ = $(CLIENT_OBJ) \
all : CHECK $(SAMBAFILES)
smbwrapper : CHECK bin/smbsh bin/smbwrapper.so @WRAP32@
smbtorture : CHECK bin/smbtorture
rpctorture : CHECK bin/rpctorture
debug2html : CHECK bin/debug2html
smbfilter : CHECK bin/smbfilter
.SUFFIXES:
.SUFFIXES: .c .o
@ -291,122 +267,9 @@ bin/.dummy:
dir=bin $(MAKEDIR); fi
@: >> $@ || : > $@ # what a fancy emoticon!
bin/smbrun: $(SMBRUN_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SMBRUN_OBJ) $(LDFLAGS) $(LIBS)
install:
bin/rpcclient: $(RPCCLIENT_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(RPCCLIENT_OBJ) $(LDFLAGS) $(LIBS)
bin/smbclient: $(CLIENT_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(LIBS)
bin/smbmount: $(MOUNT_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(MOUNT_OBJ) $(LIBS)
bin/smbmnt: $(MNT_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(MNT_OBJ) $(LIBS)
bin/smbumount: $(UMOUNT_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(UMOUNT_OBJ) $(LIBS)
bin/testparm: $(TESTPARM_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(LIBS)
bin/testprns: $(TESTPRNS_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(TESTPRNS_OBJ) $(LDFLAGS) $(LIBS)
bin/smbstatus: $(STATUS_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(STATUS_OBJ) $(LDFLAGS) $(LIBS)
bin/smbpasswd: $(SMBPASSWD_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SMBPASSWD_OBJ) $(LDFLAGS) $(LIBS)
bin/make_smbcodepage: $(MAKE_SMBCODEPAGE_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(MAKE_SMBCODEPAGE_OBJ) $(LDFLAGS) $(LIBS)
bin/nmblookup: $(NMBLOOKUP_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(LIBS)
bin/make_printerdef: $(MAKE_PRINTERDEF_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(MAKE_PRINTERDEF_OBJ) $(LDFLAGS) $(LIBS)
bin/smbtorture: $(SMBTORTURE_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS) $(LIBS)
bin/rpctorture: $(RPCTORTURE_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(RPCTORTURE_OBJ) $(LDFLAGS) $(LIBS)
bin/debug2html: $(DEBUG2HTML_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(DEBUG2HTML_OBJ) $(LDFLAGS) $(LIBS)
bin/smbfilter: $(SMBFILTER_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(LIBS)
bin/smbsh: $(SMBSH_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SMBSH_OBJ) $(LDFLAGS) $(LIBS)
install: installbin installman installscripts installcp installswat
installdirs:
$(SHELL) $(srcdir)/install-sh -d -m $(INSTALLPERMS) \
$(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(CODEPAGEDIR)
installservers: all installdirs
@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
installbin: all installdirs
@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
installscripts: installdirs
@$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
installcp: installdirs
@$(SHELL) $(srcdir)/script/installcp.sh $(srcdir) $(LIBDIR) $(CODEPAGEDIR) $(BINDIR) $(CODEPAGELIST)
installswat: installdirs
@$(SHELL) $(srcdir)/script/installswat.sh $(SWATDIR) $(srcdir)
# revert to the previously installed version
revert:
@$(SHELL) $(srcdir)/script/revert.sh $(SBINDIR) $(SPROGS)
@$(SHELL) $(srcdir)/script/revert.sh $(BINDIR) $(PROGS) $(SCRIPTS)
installman:
@$(SHELL) $(srcdir)/script/installman.sh $(MANDIR) $(srcdir) "@ROFF@"
uninstall: uninstallman uninstallbin uninstallscripts uninstallcp
uninstallman:
@$(SHELL) $(srcdir)/script/uninstallman.sh $(MANDIR) $(srcdir)
uninstallbin:
@$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
@$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
uninstallscripts:
@$(SHELL) $(srcdir)/script/uninstallscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
uninstallcp:
@$(SHELL) $(srcdir)/script/uninstallcp.sh $(CODEPAGEDIR) $(CODEPAGELIST)
uninstall:
clean:
-rm -f core */*~ *~ */*.o */*.so bin/*
@ -422,7 +285,7 @@ ctags:
ctags `find . -name "*.[ch]"`
realclean: clean
-rm -f config.log $(PROGS) $(SPROGS) bin/.dummy
-rm -f config.log bin/.dummy
-rmdir bin
distclean: realclean

View File

@ -679,169 +679,6 @@ if test x"$samba_cv_BROKEN_NISPLUS_INCLUDE_FILES" = x"yes"; then
fi
#################################################
# check for smbwrapper support
AC_MSG_CHECKING([whether to use smbwrapper])
AC_ARG_WITH(smbwrapper,
[ --with-smbwrapper Include SMB wrapper support
--without-smbwrapper Don't include SMB wrapper support (default)],
[ case "$withval" in
yes)
AC_MSG_RESULT(yes)
AC_DEFINE(WITH_SMBWRAPPER)
WRAP="bin/smbsh bin/smbwrapper.so"
if test x$ATTEMPT_WRAP32_BUILD = x; then
WRAP32=""
else
WRAP32=bin/smbwrapper.32.so
fi
# Conditions under which smbwrapper should not be built.
if test x$PICFLAG = x; then
AC_MSG_WARN([No support for PIC code - disabling smbwrapper and smbsh])
WRAP=""
WRAP32=""
elif test x$ac_cv_func_syscall = xno; then
AC_MSG_RESULT([No syscall() -- disabling smbwrapper and smbsh])
WRAP=""
WRAP32=""
fi
;;
*)
AC_MSG_RESULT(no)
;;
esac ],
AC_MSG_RESULT(no)
)
#################################################
# check for the AFS filesystem
AC_MSG_CHECKING([whether to use AFS])
AC_ARG_WITH(afs,
[ --with-afs Include AFS support
--without-afs Don't include AFS support (default)],
[ case "$withval" in
yes)
AC_MSG_RESULT(yes)
AC_DEFINE(WITH_AFS)
;;
*)
AC_MSG_RESULT(no)
;;
esac ],
AC_MSG_RESULT(no)
)
#################################################
# check for the DFS auth system
AC_MSG_CHECKING([whether to use DFS auth])
AC_ARG_WITH(dfs,
[ --with-dfs Include DFS support
--without-dfs Don't include DFS support (default)],
[ case "$withval" in
yes)
AC_MSG_RESULT(yes)
AC_DEFINE(WITH_DFS)
;;
*)
AC_MSG_RESULT(no)
;;
esac ],
AC_MSG_RESULT(no)
)
#################################################
# check for Kerberos IV auth system
AC_MSG_CHECKING([whether to use Kerberos IV])
AC_ARG_WITH(krb4,
[ --with-krb4=base-dir Include Kerberos IV support
--whithout-krb4 Don't include Kerbers IV support (default)],
[ AC_MSG_RESULT(yes)
AC_DEFINE(KRB4_AUTH)
AC_CHECK_LIB(resolv, dn_expand)
LIBS="$LIBS -lkrb -ldes"
CFLAGS="$CFLAGS -I$withval/include"
LDFLAGS="$LDFLAGS -L$withval/lib"],
AC_MSG_RESULT(no)
)
#################################################
# check for Kerberos 5 auth system
AC_MSG_CHECKING([whether to use Kerberos 5])
AC_ARG_WITH(krb5,
[ --with-krb5=base-dir Include Kerberos 5 support
--whithout-krb5 Don't include Kerbers 5 support (default)],
[ AC_MSG_RESULT(yes)
AC_DEFINE(KRB5_AUTH)
LIBS="$LIBS -ldes425 -lkrb5 -lcrypto -lcom_err"
CFLAGS="$CFLAGS -I$withval/include"
LDFLAGS="$LDFLAGS -L$withval/lib"],
AC_MSG_RESULT(no)
)
#################################################
# check for automount support
AC_MSG_CHECKING([whether to use AUTOMOUNT])
AC_ARG_WITH(automount,
[ --with-automount Include AUTOMOUNT support
--without-automount Don't include AUTOMOUNT support (default)],
[ case "$withval" in
yes)
AC_MSG_RESULT(yes)
AC_DEFINE(WITH_AUTOMOUNT)
;;
*)
AC_MSG_RESULT(no)
;;
esac ],
AC_MSG_RESULT(no)
)
#################################################
# check for smbmount support
AC_MSG_CHECKING([whether to use SMBMOUNT])
AC_ARG_WITH(smbmount,
[ --with-smbmount Include SMBMOUNT (Linux only) support
--without-smbmount Don't include SMBMOUNT support (default)],
[ case "$withval" in
yes)
AC_MSG_RESULT(yes)
AC_DEFINE(WITH_SMBMOUNT)
MPROGS="bin/smbmount bin/smbmnt bin/smbumount"
;;
*)
AC_MSG_RESULT(no)
MPROGS=
;;
esac ],
AC_MSG_RESULT(no)
MPROGS=
)
#################################################
# check for a PAM password database
AC_MSG_CHECKING([whether to use PAM password database])
AC_ARG_WITH(pam,
[ --with-pam Include PAM password database support
--without-pam Don't include PAM password database support (default)],
[ case "$withval" in
yes)
AC_MSG_RESULT(yes)
AC_DEFINE(WITH_PAM)
LIBS="$LIBS -lpam"
;;
*)
AC_MSG_RESULT(no)
;;
esac ],
AC_MSG_RESULT(no)
)
#################################################
# check for a LDAP password database
AC_MSG_CHECKING([whether to use LDAP password database])

View File

@ -623,7 +623,6 @@ extern int errno;
#include "version.h"
#include "smb.h"
#include "smbw.h"
#include "nameserv.h"
#include "byteorder.h"

View File

@ -1,62 +0,0 @@
/*
Unix SMB/Netbios implementation.
Version 2.0
SMB wrapper functions - definitions
Copyright (C) Andrew Tridgell 1998
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#define SMBW_PREFIX "/smb/"
#define SMBW_DUMMY "/dev/null"
#define SMBW_CLI_FD 512
#define SMBW_MAX_OPEN 8192
#define SMBW_FILE_MODE (S_IFREG | 0444)
#define SMBW_DIR_MODE (S_IFDIR | 0555)
struct smbw_server {
struct smbw_server *next, *prev;
struct cli_state cli;
char *server_name;
char *share_name;
dev_t dev;
BOOL no_pathinfo2;
};
struct smbw_filedes {
int cli_fd;
int ref_count;
char *fname;
off_t offset;
};
struct smbw_file {
struct smbw_file *next, *prev;
struct smbw_filedes *f;
int fd;
struct smbw_server *srv;
};
struct smbw_dir {
struct smbw_dir *next, *prev;
int fd;
int offset, count, malloced;
struct smbw_server *srv;
struct file_info *list;
char *path;
};