[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-778-g0cf317f

Volker Lendecke vlendec at samba.org
Tue Sep 29 05:52:08 MDT 2009


The branch, master has been updated
       via  0cf317f36f7582cb0540c74910020c9d5f4aa14f (commit)
      from  64e08fef16001d62b43f6925a26ad739391cface (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0cf317f36f7582cb0540c74910020c9d5f4aa14f
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Sep 29 13:11:20 2009 +0200

    s3: Remove the lua interpreter again
    
    This was meant to support async winbind. But as the hairy parts of async
    winbind (getgrent) are done without it, it can go again.

-----------------------------------------------------------------------

Summary of changes:
 source3/Makefile.in                      |   88 +-
 source3/configure.in                     |   41 -
 source3/locale/net/de.po                 |   64 -
 source3/locale/net/genmsg                |    2 +-
 source3/lua-5.1.4/COPYRIGHT              |   34 -
 source3/lua-5.1.4/HISTORY                |  183 -
 source3/lua-5.1.4/INSTALL                |   99 -
 source3/lua-5.1.4/Makefile               |  128 -
 source3/lua-5.1.4/README                 |   37 -
 source3/lua-5.1.4/doc/amazon.gif         |  Bin 797 -> 0 bytes
 source3/lua-5.1.4/doc/contents.html      |  499 --
 source3/lua-5.1.4/doc/cover.png          |  Bin 3305 -> 0 bytes
 source3/lua-5.1.4/doc/logo.gif           |  Bin 4232 -> 0 bytes
 source3/lua-5.1.4/doc/lua.css            |   40 -
 source3/lua-5.1.4/doc/lua.html           |  172 -
 source3/lua-5.1.4/doc/luac.html          |  145 -
 source3/lua-5.1.4/doc/manual.css         |   12 -
 source3/lua-5.1.4/doc/manual.html        | 8800 ------------------------------
 source3/lua-5.1.4/doc/readme.html        |   40 -
 source3/lua-5.1.4/etc/Makefile           |   44 -
 source3/lua-5.1.4/etc/README             |   36 -
 source3/lua-5.1.4/etc/all.c              |   38 -
 source3/lua-5.1.4/etc/lua.hpp            |    9 -
 source3/lua-5.1.4/etc/lua.ico            |  Bin 1078 -> 0 bytes
 source3/lua-5.1.4/etc/luavs.bat          |   28 -
 source3/lua-5.1.4/etc/min.c              |   39 -
 source3/lua-5.1.4/etc/noparser.c         |   50 -
 source3/lua-5.1.4/etc/strict.lua         |   40 -
 source3/lua-5.1.4/src/Makefile           |  182 -
 source3/lua-5.1.4/src/lapi.c             | 1086 ----
 source3/lua-5.1.4/src/lapi.h             |   16 -
 source3/lua-5.1.4/src/lauxlib.c          |  651 ---
 source3/lua-5.1.4/src/lauxlib.h          |  172 -
 source3/lua-5.1.4/src/lbaselib.c         |  652 ---
 source3/lua-5.1.4/src/lcode.c            |  838 ---
 source3/lua-5.1.4/src/lcode.h            |   76 -
 source3/lua-5.1.4/src/ldblib.c           |  396 --
 source3/lua-5.1.4/src/ldebug.c           |  637 ---
 source3/lua-5.1.4/src/ldebug.h           |   33 -
 source3/lua-5.1.4/src/ldo.c              |  516 --
 source3/lua-5.1.4/src/ldo.h              |   56 -
 source3/lua-5.1.4/src/ldump.c            |  164 -
 source3/lua-5.1.4/src/lfunc.c            |  173 -
 source3/lua-5.1.4/src/lfunc.h            |   34 -
 source3/lua-5.1.4/src/lgc.c              |  710 ---
 source3/lua-5.1.4/src/lgc.h              |  110 -
 source3/lua-5.1.4/src/linit.c            |   37 -
 source3/lua-5.1.4/src/liolib.c           |  552 --
 source3/lua-5.1.4/src/llex.c             |  460 --
 source3/lua-5.1.4/src/llex.h             |   81 -
 source3/lua-5.1.4/src/llimits.h          |  128 -
 source3/lua-5.1.4/src/lmathlib.c         |  262 -
 source3/lua-5.1.4/src/lmem.c             |   85 -
 source3/lua-5.1.4/src/lmem.h             |   48 -
 source3/lua-5.1.4/src/loadlib.c          |  665 ---
 source3/lua-5.1.4/src/lobject.c          |  214 -
 source3/lua-5.1.4/src/lobject.h          |  380 --
 source3/lua-5.1.4/src/lopcodes.c         |  101 -
 source3/lua-5.1.4/src/lopcodes.h         |  268 -
 source3/lua-5.1.4/src/loslib.c           |  242 -
 source3/lua-5.1.4/src/lparser.c          | 1339 -----
 source3/lua-5.1.4/src/lparser.h          |   82 -
 source3/lua-5.1.4/src/lstate.c           |  213 -
 source3/lua-5.1.4/src/lstate.h           |  168 -
 source3/lua-5.1.4/src/lstring.c          |  110 -
 source3/lua-5.1.4/src/lstring.h          |   31 -
 source3/lua-5.1.4/src/lstrlib.c          |  868 ---
 source3/lua-5.1.4/src/ltable.c           |  588 --
 source3/lua-5.1.4/src/ltable.h           |   40 -
 source3/lua-5.1.4/src/ltablib.c          |  286 -
 source3/lua-5.1.4/src/ltm.c              |   74 -
 source3/lua-5.1.4/src/ltm.h              |   54 -
 source3/lua-5.1.4/src/lua.c              |  391 --
 source3/lua-5.1.4/src/lua.h              |  388 --
 source3/lua-5.1.4/src/luac.c             |  200 -
 source3/lua-5.1.4/src/luaconf.h          |  762 ---
 source3/lua-5.1.4/src/lualib.h           |   53 -
 source3/lua-5.1.4/src/lundump.c          |  227 -
 source3/lua-5.1.4/src/lundump.h          |   36 -
 source3/lua-5.1.4/src/lvm.c              |  762 ---
 source3/lua-5.1.4/src/lvm.h              |   36 -
 source3/lua-5.1.4/src/lzio.c             |   80 -
 source3/lua-5.1.4/src/lzio.h             |   67 -
 source3/lua-5.1.4/src/print.c            |  227 -
 source3/lua-5.1.4/test/README            |   25 -
 source3/lua-5.1.4/test/bisect.lua        |   27 -
 source3/lua-5.1.4/test/cf.lua            |   16 -
 source3/lua-5.1.4/test/echo.lua          |    5 -
 source3/lua-5.1.4/test/env.lua           |    7 -
 source3/lua-5.1.4/test/factorial.lua     |   32 -
 source3/lua-5.1.4/test/fib.lua           |   40 -
 source3/lua-5.1.4/test/fibfor.lua        |   13 -
 source3/lua-5.1.4/test/globals.lua       |   13 -
 source3/lua-5.1.4/test/hello.lua         |    3 -
 source3/lua-5.1.4/test/life.lua          |  111 -
 source3/lua-5.1.4/test/luac.lua          |    7 -
 source3/lua-5.1.4/test/printf.lua        |    7 -
 source3/lua-5.1.4/test/readonly.lua      |   12 -
 source3/lua-5.1.4/test/sieve.lua         |   29 -
 source3/lua-5.1.4/test/sort.lua          |   66 -
 source3/lua-5.1.4/test/table.lua         |   12 -
 source3/lua-5.1.4/test/trace-calls.lua   |   32 -
 source3/lua-5.1.4/test/trace-globals.lua |   38 -
 source3/lua-5.1.4/test/xd.lua            |   14 -
 source3/utils/net.c                      |    7 -
 source3/utils/net_lua.c                  |  386 --
 source3/utils/net_proto.h                |    4 -
 107 files changed, 4 insertions(+), 28677 deletions(-)
 delete mode 100644 source3/lua-5.1.4/COPYRIGHT
 delete mode 100644 source3/lua-5.1.4/HISTORY
 delete mode 100644 source3/lua-5.1.4/INSTALL
 delete mode 100644 source3/lua-5.1.4/Makefile
 delete mode 100644 source3/lua-5.1.4/README
 delete mode 100644 source3/lua-5.1.4/doc/amazon.gif
 delete mode 100644 source3/lua-5.1.4/doc/contents.html
 delete mode 100644 source3/lua-5.1.4/doc/cover.png
 delete mode 100644 source3/lua-5.1.4/doc/logo.gif
 delete mode 100644 source3/lua-5.1.4/doc/lua.css
 delete mode 100644 source3/lua-5.1.4/doc/lua.html
 delete mode 100644 source3/lua-5.1.4/doc/luac.html
 delete mode 100644 source3/lua-5.1.4/doc/manual.css
 delete mode 100644 source3/lua-5.1.4/doc/manual.html
 delete mode 100644 source3/lua-5.1.4/doc/readme.html
 delete mode 100644 source3/lua-5.1.4/etc/Makefile
 delete mode 100644 source3/lua-5.1.4/etc/README
 delete mode 100644 source3/lua-5.1.4/etc/all.c
 delete mode 100644 source3/lua-5.1.4/etc/lua.hpp
 delete mode 100644 source3/lua-5.1.4/etc/lua.ico
 delete mode 100644 source3/lua-5.1.4/etc/luavs.bat
 delete mode 100644 source3/lua-5.1.4/etc/min.c
 delete mode 100644 source3/lua-5.1.4/etc/noparser.c
 delete mode 100644 source3/lua-5.1.4/etc/strict.lua
 delete mode 100644 source3/lua-5.1.4/src/Makefile
 delete mode 100644 source3/lua-5.1.4/src/lapi.c
 delete mode 100644 source3/lua-5.1.4/src/lapi.h
 delete mode 100644 source3/lua-5.1.4/src/lauxlib.c
 delete mode 100644 source3/lua-5.1.4/src/lauxlib.h
 delete mode 100644 source3/lua-5.1.4/src/lbaselib.c
 delete mode 100644 source3/lua-5.1.4/src/lcode.c
 delete mode 100644 source3/lua-5.1.4/src/lcode.h
 delete mode 100644 source3/lua-5.1.4/src/ldblib.c
 delete mode 100644 source3/lua-5.1.4/src/ldebug.c
 delete mode 100644 source3/lua-5.1.4/src/ldebug.h
 delete mode 100644 source3/lua-5.1.4/src/ldo.c
 delete mode 100644 source3/lua-5.1.4/src/ldo.h
 delete mode 100644 source3/lua-5.1.4/src/ldump.c
 delete mode 100644 source3/lua-5.1.4/src/lfunc.c
 delete mode 100644 source3/lua-5.1.4/src/lfunc.h
 delete mode 100644 source3/lua-5.1.4/src/lgc.c
 delete mode 100644 source3/lua-5.1.4/src/lgc.h
 delete mode 100644 source3/lua-5.1.4/src/linit.c
 delete mode 100644 source3/lua-5.1.4/src/liolib.c
 delete mode 100644 source3/lua-5.1.4/src/llex.c
 delete mode 100644 source3/lua-5.1.4/src/llex.h
 delete mode 100644 source3/lua-5.1.4/src/llimits.h
 delete mode 100644 source3/lua-5.1.4/src/lmathlib.c
 delete mode 100644 source3/lua-5.1.4/src/lmem.c
 delete mode 100644 source3/lua-5.1.4/src/lmem.h
 delete mode 100644 source3/lua-5.1.4/src/loadlib.c
 delete mode 100644 source3/lua-5.1.4/src/lobject.c
 delete mode 100644 source3/lua-5.1.4/src/lobject.h
 delete mode 100644 source3/lua-5.1.4/src/lopcodes.c
 delete mode 100644 source3/lua-5.1.4/src/lopcodes.h
 delete mode 100644 source3/lua-5.1.4/src/loslib.c
 delete mode 100644 source3/lua-5.1.4/src/lparser.c
 delete mode 100644 source3/lua-5.1.4/src/lparser.h
 delete mode 100644 source3/lua-5.1.4/src/lstate.c
 delete mode 100644 source3/lua-5.1.4/src/lstate.h
 delete mode 100644 source3/lua-5.1.4/src/lstring.c
 delete mode 100644 source3/lua-5.1.4/src/lstring.h
 delete mode 100644 source3/lua-5.1.4/src/lstrlib.c
 delete mode 100644 source3/lua-5.1.4/src/ltable.c
 delete mode 100644 source3/lua-5.1.4/src/ltable.h
 delete mode 100644 source3/lua-5.1.4/src/ltablib.c
 delete mode 100644 source3/lua-5.1.4/src/ltm.c
 delete mode 100644 source3/lua-5.1.4/src/ltm.h
 delete mode 100644 source3/lua-5.1.4/src/lua.c
 delete mode 100644 source3/lua-5.1.4/src/lua.h
 delete mode 100644 source3/lua-5.1.4/src/luac.c
 delete mode 100644 source3/lua-5.1.4/src/luaconf.h
 delete mode 100644 source3/lua-5.1.4/src/lualib.h
 delete mode 100644 source3/lua-5.1.4/src/lundump.c
 delete mode 100644 source3/lua-5.1.4/src/lundump.h
 delete mode 100644 source3/lua-5.1.4/src/lvm.c
 delete mode 100644 source3/lua-5.1.4/src/lvm.h
 delete mode 100644 source3/lua-5.1.4/src/lzio.c
 delete mode 100644 source3/lua-5.1.4/src/lzio.h
 delete mode 100644 source3/lua-5.1.4/src/print.c
 delete mode 100644 source3/lua-5.1.4/test/README
 delete mode 100644 source3/lua-5.1.4/test/bisect.lua
 delete mode 100644 source3/lua-5.1.4/test/cf.lua
 delete mode 100644 source3/lua-5.1.4/test/echo.lua
 delete mode 100644 source3/lua-5.1.4/test/env.lua
 delete mode 100644 source3/lua-5.1.4/test/factorial.lua
 delete mode 100644 source3/lua-5.1.4/test/fib.lua
 delete mode 100644 source3/lua-5.1.4/test/fibfor.lua
 delete mode 100644 source3/lua-5.1.4/test/globals.lua
 delete mode 100644 source3/lua-5.1.4/test/hello.lua
 delete mode 100644 source3/lua-5.1.4/test/life.lua
 delete mode 100644 source3/lua-5.1.4/test/luac.lua
 delete mode 100644 source3/lua-5.1.4/test/printf.lua
 delete mode 100644 source3/lua-5.1.4/test/readonly.lua
 delete mode 100644 source3/lua-5.1.4/test/sieve.lua
 delete mode 100644 source3/lua-5.1.4/test/sort.lua
 delete mode 100644 source3/lua-5.1.4/test/table.lua
 delete mode 100644 source3/lua-5.1.4/test/trace-calls.lua
 delete mode 100644 source3/lua-5.1.4/test/trace-globals.lua
 delete mode 100644 source3/lua-5.1.4/test/xd.lua
 delete mode 100644 source3/utils/net_lua.c


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index abd005a..0a48b01 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -79,7 +79,6 @@ POPT_LIBS=@POPTLIBS@
 LIBTALLOC_LIBS=@LIBTALLOC_LIBS@
 LIBTDB_LIBS=@LIBTDB_LIBS@
 LIBNETAPI_LIBS=@LIBNETAPI_LIBS@
-LIBLUA_LIBS=@LIBLUA_LIBS@
 LIBSMBCLIENT_LIBS=@LIBSMBCLIENT_LIBS@
 LIBSMBSHAREMODES_LIBS=@LIBSMBSHAREMODES_LIBS@
 
@@ -997,7 +996,7 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \
 	   $(PASSWD_UTIL_OBJ) utils/net_dns.o utils/net_ads_gpo.o \
 	   utils/net_conf.o utils/net_join.o utils/net_user.o \
 	   utils/net_group.o utils/net_file.o utils/net_registry.o \
-	   auth/token_util.o utils/net_dom.o utils/net_share.o utils/net_lua.o \
+	   auth/token_util.o utils/net_dom.o utils/net_share.o \
 	   utils/net_eventlog.o
 
 # these are not processed by make proto
@@ -1563,12 +1562,12 @@ bin/smbclient at EXEEXT@: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_T
 		$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(DNSSD_LIBS) \
 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
 
-bin/net at EXEEXT@: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_TARGET@ @LIBNETAPI_TARGET@ @LIBLUA_TARGET@
+bin/net at EXEEXT@: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_TARGET@ @LIBNETAPI_TARGET@
 	@echo Linking $@
 	@$(CC) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
 		$(POPT_LIBS) $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) \
 		$(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) \
-		@INIPARSERLIBS@ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(LIBNETAPI_LIBS)  $(LIBLUA_LIBS) -lm \
+		@INIPARSERLIBS@ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(LIBNETAPI_LIBS) \
 		$(ZLIB_LIBS)
 
 bin/profiles at EXEEXT@: $(BINARY_PREREQS) $(PROFILES_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
@@ -2427,87 +2426,6 @@ bin/libbigballofmud. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBBIGBALLOFMUD_OBJ) @LIBTAL
 # it can be fixed or if they just can't be called from a static
 # library.
 
-#-------------------------------------------------------------------
-#
-# libsmblua
-#
-#-------------------------------------------------------------------
-
-LIBLUA_OBJ0 = @LIBLUA_OBJ0@
-
-LIBLUA_OBJ = $(LIBLUA_OBJ0)
-
-LIBLUA_SHARED_TARGET=@LIBLUA_SHARED_TARGET@
-LIBLUA_SOVER=@LIBLUA_SOVER@
-LIBLUA_SHARED_TARGET_SONAME=$(LIBLUA_SHARED_TARGET).$(LIBLUA_SOVER)
-LIBLUA_STATIC_TARGET=@LIBLUA_STATIC_TARGET@
-LIBLUA=@LIBLUA_STATIC@ @LIBLUA_SHARED@
-LIBLUA_SYMS=$(srcdir)/exports/liblua. at SYMSEXT@
-LIBLUA_HEADERS=$(srcdir)/lua-5.1.4/src/lua.h
-
-$(LIBLUA_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBLUA_OBJ) $(LIBLUA_SYMS) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
-	@echo Linking shared library $@
-	@$(SHLD_DSO) $(LIBLUA_OBJ) \
-		$(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
-		$(KRB5LIBS) $(LDAP_LIBS) \
-		@SONAMEFLAG@`basename $@`
-
-$(LIBLUA_SHARED_TARGET): $(LIBLUA_SHARED_TARGET_SONAME)
-	@rm -f $@
-	@ln -f -s `basename $(LIBLUA_SHARED_TARGET_SONAME)` $@
-
-$(LIBLUA_STATIC_TARGET): $(BINARY_PREREQS) $(LIBLUA_OBJ0)
-	@echo Linking non-shared library $@
-	@-$(AR) -rc $@ $(LIBLUA_OBJ0)
-
-liblua: $(LIBLUA)
-
-cleanliblua::
-	-rm -f \
-		$(LIBLUA_SHARED_TARGET) \
-		$(LIBLUA_SHARED_TARGET_SONAME) \
-		$(LIBLUA_STATIC_TARGET)
-
-installliblua:: installdirs liblua
-	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-	-$(INSTALLLIBCMD_SH) $(LIBLUA_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
-	@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBLUA_SHARED_TARGET)`
-	-if test -f $(LIBLUA_SHARED_TARGET_SONAME) ; then \
-		ln -f -s `basename $(LIBLUA_SHARED_TARGET_SONAME)` \
-			$(DESTDIR)$(LIBDIR)/`basename $(LIBLUA_SHARED_TARGET)` ; \
-	fi
-	-$(INSTALLLIBCMD_A) $(LIBLUA_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
-	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
-	-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBLUA_HEADERS) $(DESTDIR)${prefix}/include
-
-uninstallliblua::
-	-rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBLUA_SHARED_TARGET)`
-	-$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBLUA_SHARED_TARGET_SONAME)`
-	-$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBLUA_STATIC_TARGET)`
-	-rm -f $(DESTDIR)${prefix}/include/smb_share_modes.h
-
-libs:: liblua
-installlibs:: @INSTALL_LIBLUA@
-uninstalllibs:: @UNINSTALL_LIBLUA@
-cleanlibs:: cleanliblua
-shlibs test_shlibs: @LIBLUA_SHARED@
-
-showliblua:
-	@echo  ""
-	@echo "LIBLUA_SHARED               = @LIBLUA_SHARED@"
-	@echo "LIBLUA_STATIC               = @LIBLUA_STATIC@"
-	@echo "LIBLUA_TARGET               = @LIBLUA_TARGET@"
-	@echo "LIBLUA_LIBS                 = $(LIBLUA_LIBS)"
-	@echo ""
-	@echo "LIBLUA_SHARED_TARGET        = $(LIBLUA_SHARED_TARGET)"
-	@echo "LIBLUA_SOVER                = $(LIBLUA_SOVER)"
-	@echo "LIBLUA_SHARED TARGET_SONAME = $(LIBLUA_SHARED_TARGET_SONAME)"
-	@echo "LIBLUA_STATIC_TARGET        = $(LIBLUA_STATIC_TARGET)"
-	@echo "LIBLUA                      = $(LIBLUA)"
-
-showlibs:: showliblua
-
-
 #####################################################################
 #
 # shared modules
diff --git a/source3/configure.in b/source3/configure.in
index e298ec6..249a5ac 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -4809,47 +4809,6 @@ then
 	AC_SUBST(TDBTORTURE)
 fi
 
-
-AC_ARG_ENABLE(external_liblua,
-	[AS_HELP_STRING([--enable-external-liblua],
-		[Enable external lua [default=auto]])],
-		[ enable_external_liblua=$enableval ],
-		[ enable_external_liblua=auto ])
-
-if test "x$enable_external_liblua" != xno
-then
-	PKG_CHECK_MODULES(LIBLUA, lua5.1 >= 5.1.4,
-		[ enable_external_liblua=yes ],
-		[
-		if test x$enable_external_liblua = xyes; then
-			AC_MSG_ERROR([Unable to find liblua])
-		else
-			enable_external_liblua=no
-		fi
-		])
-fi
-
-AC_SUBST(LIBLUA_OBJ0)
-if test "x$enable_external_liblua" = xno
-then
-	LINK_LIBLUA=STATIC
-	SMB_LIBRARY(lua, 0)
-	LIBLUA_OBJ0="lua-5.1.4/src/lapi.o lua-5.1.4/src/lauxlib.o \
-		lua-5.1.4/src/lbaselib.o lua-5.1.4/src/lcode.o \
-		lua-5.1.4/src/ldblib.o lua-5.1.4/src/ldebug.o lua-5.1.4/src/ldo.o \
-		lua-5.1.4/src/ldump.o lua-5.1.4/src/lfunc.o lua-5.1.4/src/lgc.o \
-		lua-5.1.4/src/linit.o lua-5.1.4/src/liolib.o lua-5.1.4/src/llex.o \
-		lua-5.1.4/src/lmathlib.o lua-5.1.4/src/lmem.o \
-		lua-5.1.4/src/loadlib.o lua-5.1.4/src/lobject.o \
-		lua-5.1.4/src/lopcodes.o lua-5.1.4/src/loslib.o \
-		lua-5.1.4/src/lparser.o lua-5.1.4/src/lstate.o \
-		lua-5.1.4/src/lstring.o lua-5.1.4/src/lstrlib.o \
-		lua-5.1.4/src/ltable.o lua-5.1.4/src/ltablib.o lua-5.1.4/src/ltm.o \
-		lua-5.1.4/src/lundump.o lua-5.1.4/src/lvm.o \
-		lua-5.1.4/src/lzio.o lua-5.1.4/src/print.o"
-	AC_SUBST(LIBLUA_OBJ0)
-fi
-
 SMB_LIBRARY(netapi, 0)
 SMB_LIBRARY(smbclient, 0)
 SMB_LIBRARY(smbsharemodes, 0)
diff --git a/source3/locale/net/de.po b/source3/locale/net/de.po
index d99873b..a336936 100644
--- a/source3/locale/net/de.po
+++ b/source3/locale/net/de.po
@@ -378,14 +378,6 @@ msgstr ""
 msgid "  Use 'net help registry' to get more information about 'net registry' commands."
 msgstr ""
 
-#: ../../utils/net.c:584
-msgid "Open a lua interpreter"
-msgstr ""
-
-#: ../../utils/net.c:585
-msgid "  Use 'net help lua' to get more information about 'net lua' commands."
-msgstr ""
-
 #: ../../utils/net.c:591
 msgid "Process Win32 *.evt eventlog files"
 msgstr ""
@@ -3369,62 +3361,6 @@ msgid ""
 "Usage: \n"
 msgstr ""
 
-#: ../../utils/net_lua.c:60
-msgid "connect: Expected IP-Address"
-msgstr ""
-
-#: ../../utils/net_lua.c:65
-msgid "connect: Expected port"
-msgstr ""
-
-#: ../../utils/net_lua.c:84
-#, c-format
-msgid "connect failed: %s"
-msgstr ""
-
-#: ../../utils/net_lua.c:132
-#, c-format
-msgid "socket domain %s unknown"
-msgstr ""
-
-#: ../../utils/net_lua.c:144
-#, c-format
-msgid "socket type %s unknown"
-msgstr ""
-
-#: ../../utils/net_lua.c:155
-#, c-format
-msgid "socket() failed: %s"
-msgstr ""
-
-#: ../../utils/net_lua.c:278
-msgid "evt_reference_thread failed\n"
-msgstr ""
-
-#: ../../utils/net_lua.c:287
-msgid "event_add_timed failed"
-msgstr ""
-
-#: ../../utils/net_lua.c:300
-msgid "event_once called from non-base thread"
-msgstr ""
-
-#: ../../utils/net_lua.c:323
-msgid "event_context_init failed"
-msgstr ""
-
-#: ../../utils/net_lua.c:353
-msgid "lua_newstate failed\n"
-msgstr ""
-
-#: ../../utils/net_lua.c:371
-msgid "luaL_dofile returned an error\n"
-msgstr ""
-
-#: ../../utils/net_lua.c:376
-msgid "luaL_dostring returned an error\n"
-msgstr ""
-
 #: ../../utils/net_rap.c:39
 msgid ""
 "\n"
diff --git a/source3/locale/net/genmsg b/source3/locale/net/genmsg
index 7202e81..fcae0e7 100755
--- a/source3/locale/net/genmsg
+++ b/source3/locale/net/genmsg
@@ -29,7 +29,7 @@ add_basedir_to_filelist() {
 FILES=`add_basedir_to_filelist ../../utils net.c net_ads.c net_ads_gpo.c \
        net_afs.c net_cache.c net_conf.c net_dom.c net_eventlog.c net_file.c \
        net_group.c net_groupmap.c net_help.c net_help_common.c net_idmap.c \
-       net_join.c net_lookup.c net_lua.c net_rap.c net_registry.c \
+       net_join.c net_lookup.c net_rap.c net_registry.c \
        net_registry_util.c net_rpc.c net_rpc_audit.c net_rpc_join.c \
        net_rpc_printer.c net_rpc_registry.c net_rpc_rights.c net_rpc_samsync.c \
        net_rpc_service.c net_rpc_sh_acct.c net_rpc_shell.c net_sam.c \
diff --git a/source3/lua-5.1.4/COPYRIGHT b/source3/lua-5.1.4/COPYRIGHT
deleted file mode 100644
index 3a53e74..0000000
--- a/source3/lua-5.1.4/COPYRIGHT
+++ /dev/null
@@ -1,34 +0,0 @@
-Lua License
------------
-
-Lua is licensed under the terms of the MIT license reproduced below.
-This means that Lua is free software and can be used for both academic
-and commercial purposes at absolutely no cost.
-
-For details and rationale, see http://www.lua.org/license.html .
-
-===============================================================================
-
-Copyright (C) 1994-2008 Lua.org, PUC-Rio.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-===============================================================================
-
-(end of COPYRIGHT)
diff --git a/source3/lua-5.1.4/HISTORY b/source3/lua-5.1.4/HISTORY
deleted file mode 100644
index ce0c95b..0000000
--- a/source3/lua-5.1.4/HISTORY
+++ /dev/null
@@ -1,183 +0,0 @@
-HISTORY for Lua 5.1
-
-* Changes from version 5.0 to 5.1
-  -------------------------------
-  Language:
-  + new module system.
-  + new semantics for control variables of fors.
-  + new semantics for setn/getn.
-  + new syntax/semantics for varargs.
-  + new long strings and comments.
-  + new `mod' operator (`%')
-  + new length operator #t
-  + metatables for all types
-  API:
-  + new functions: lua_createtable, lua_get(set)field, lua_push(to)integer.
-  + user supplies memory allocator (lua_open becomes lua_newstate).
-  + luaopen_* functions must be called through Lua.
-  Implementation:
-  + new configuration scheme via luaconf.h.
-  + incremental garbage collection.
-  + better handling of end-of-line in the lexer.
-  + fully reentrant parser (new Lua function `load')
-  + better support for 64-bit machines.
-  + native loadlib support for Mac OS X.
-  + standard distribution in only one library (lualib.a merged into lua.a)
-
-* Changes from version 4.0 to 5.0
-  -------------------------------
-  Language:
-  + lexical scoping.
-  + Lua coroutines.
-  + standard libraries now packaged in tables.
-  + tags replaced by metatables and tag methods replaced by metamethods,
-    stored in metatables.
-  + proper tail calls.
-  + each function can have its own global table, which can be shared.
-  + new __newindex metamethod, called when we insert a new key into a table.
-  + new block comments: --[[ ... ]].
-  + new generic for.
-  + new weak tables.
-  + new boolean type.
-  + new syntax "local function".
-  + (f()) returns the first value returned by f.
-  + {f()} fills a table with all values returned by f.
-  + \n ignored in [[\n .
-  + fixed and-or priorities.
-  + more general syntax for function definition (e.g. function a.x.y:f()...end).
-  + more general syntax for function calls (e.g. (print or write)(9)).
-  + new functions (time/date, tmpfile, unpack, require, load*, etc.).
-  API:
-  + chunks are loaded by using lua_load; new luaL_loadfile and luaL_loadbuffer.
-  + introduced lightweight userdata, a simple "void*" without a metatable.
-  + new error handling protocol: the core no longer prints error messages;
-    all errors are reported to the caller on the stack.
-  + new lua_atpanic for host cleanup.
-  + new, signal-safe, hook scheme.
-  Implementation:
-  + new license: MIT.
-  + new, faster, register-based virtual machine.
-  + support for external multithreading and coroutines.
-  + new and consistent error message format.
-  + the core no longer needs "stdio.h" for anything (except for a single
-    use of sprintf to convert numbers to strings).
-  + lua.c now runs the environment variable LUA_INIT, if present. It can
-    be "@filename", to run a file, or the chunk itself.
-  + support for user extensions in lua.c.
-    sample implementation given for command line editing.
-  + new dynamic loading library, active by default on several platforms.
-  + safe garbage-collector metamethods.
-  + precompiled bytecodes checked for integrity (secure binary dostring).
-  + strings are fully aligned.
-  + position capture in string.find.
-  + read('*l') can read lines with embedded zeros.
-
-* Changes from version 3.2 to 4.0
-  -------------------------------
-  Language:
-  + new "break" and "for" statements (both numerical and for tables).
-  + uniform treatment of globals: globals are now stored in a Lua table.
-  + improved error messages.
-  + no more '$debug': full speed *and* full debug information.
-  + new read form: read(N) for next N bytes.
-  + general read patterns now deprecated.
-    (still available with -DCOMPAT_READPATTERNS.)
-  + all return values are passed as arguments for the last function
-    (old semantics still available with -DLUA_COMPAT_ARGRET)
-  + garbage collection tag methods for tables now deprecated.
-  + there is now only one tag method for order.
-  API:
-  + New API: fully re-entrant, simpler, and more efficient.
-  + New debug API.
-  Implementation:
-  + faster than ever: cleaner virtual machine and new hashing algorithm.
-  + non-recursive garbage-collector algorithm.
-  + reduced memory usage for programs with many strings.
-  + improved treatment for memory allocation errors.
-  + improved support for 16-bit machines (we hope).
-  + code now compiles unmodified as both ANSI C and C++.
-  + numbers in bases other than 10 are converted using strtoul.
-  + new -f option in Lua to support #! scripts.
-  + luac can now combine text and binaries.
-
-* Changes from version 3.1 to 3.2
-  -------------------------------
-  + redirected all output in Lua's core to _ERRORMESSAGE and _ALERT.
-  + increased limit on the number of constants and globals per function
-    (from 2^16 to 2^24).
-  + debugging info (lua_debug and hooks) moved into lua_state and new API
-    functions provided to get and set this info.
-  + new debug lib gives full debugging access within Lua.
-  + new table functions "foreachi", "sort", "tinsert", "tremove", "getn".
-  + new io functions "flush", "seek".
-
-* Changes from version 3.0 to 3.1
-  -------------------------------
-  + NEW FEATURE: anonymous functions with closures (via "upvalues").
-  + new syntax:
-    - local variables in chunks.
-    - better scope control with DO block END.
-    - constructors can now be also written: { record-part; list-part }.
-    - more general syntax for function calls and lvalues, e.g.:
-      f(x).y=1
-      o:f(x,y):g(z)
-      f"string" is sugar for f("string")
-  + strings may now contain arbitrary binary data (e.g., embedded zeros).
-  + major code re-organization and clean-up; reduced module interdependecies.
-  + no arbitrary limits on the total number of constants and globals.
-  + support for multiple global contexts.
-  + better syntax error messages.
-  + new traversal functions "foreach" and "foreachvar".
-  + the default for numbers is now double.
-    changing it to use floats or longs is easy.
-  + complete debug information stored in pre-compiled chunks.
-  + sample interpreter now prompts user when run interactively, and also
-    handles control-C interruptions gracefully.
-
-* Changes from version 2.5 to 3.0
-  -------------------------------
-  + NEW CONCEPT: "tag methods".
-    Tag methods replace fallbacks as the meta-mechanism for extending the
-    semantics of Lua. Whereas fallbacks had a global nature, tag methods
-    work on objects having the same tag (e.g., groups of tables).
-    Existing code that uses fallbacks should work without change.
-  + new, general syntax for constructors {[exp] = exp, ... }.
-  + support for handling variable number of arguments in functions (varargs).
-  + support for conditional compilation ($if ... $else ... $end).
-  + cleaner semantics in API simplifies host code.
-  + better support for writing libraries (auxlib.h).
-  + better type checking and error messages in the standard library.
-  + luac can now also undump.
-
-* Changes from version 2.4 to 2.5
-  -------------------------------
-  + io and string libraries are now based on pattern matching;
-    the old libraries are still available for compatibility
-  + dofile and dostring can now return values (via return statement)
-  + better support for 16- and 64-bit machines
-  + expanded documentation, with more examples
-
-* Changes from version 2.2 to 2.4
-  -------------------------------
-  + external compiler creates portable binary files that can be loaded faster
-  + interface for debugging and profiling
-  + new "getglobal" fallback
-  + new functions for handling references to Lua objects
-  + new functions in standard lib
-  + only one copy of each string is stored
-  + expanded documentation, with more examples
-
-* Changes from version 2.1 to 2.2
-  -------------------------------
-  + functions now may be declared with any "lvalue" as a name
-  + garbage collection of functions
-  + support for pipes
-
-* Changes from version 1.1 to 2.1
-  -------------------------------
-  + object-oriented support
-  + fallbacks
-  + simplified syntax for tables
-  + many internal improvements
-
-(end of HISTORY)


-- 
Samba Shared Repository


More information about the samba-cvs mailing list