[SCM] Samba Shared Repository - branch master updated
Kai Blin
kai at samba.org
Sat May 18 08:33:02 MDT 2013
The branch, master has been updated
via 61a2ad3 swat: Remove swat.
from a3a3086 dns: Also print packet information for DBGC_DNS
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 61a2ad3c020424cead067cbdc89ea6f25708fde4
Author: Kai Blin <kai at samba.org>
Date: Fri May 17 14:16:26 2013 +0200
swat: Remove swat.
Signed-off-by: Kai Blin <kai at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Kai Blin <kai at samba.org>
Autobuild-Date(master): Sat May 18 16:32:38 CEST 2013 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_patterns.py | 1 -
dynconfig/config.m4 | 3 -
dynconfig/dynconfig.c | 1 -
dynconfig/dynconfig.h | 1 -
dynconfig/wscript | 4 -
examples/misc/swat.pl | 122 --
source3/Makefile.in | 33 +-
source3/configure.in | 2 -
source3/lib/popt_common.c | 10 -
source3/m4/swat.m4 | 27 -
source3/param/loadparm.c | 2 +-
source3/po/de.msg | 616 ----------
source3/po/en.msg | 592 ----------
source3/po/fi.msg | 610 ----------
source3/po/fr.msg | 592 ----------
source3/po/genmsg | 40 -
source3/po/it.msg | 592 ----------
source3/po/ja.msg | 594 ----------
source3/po/nl.msg | 592 ----------
source3/po/pl.msg | 592 ----------
source3/po/ru.msg | 606 ----------
source3/po/tr.msg | 593 ----------
source3/script/installmsg.sh | 65 -
source3/script/installswat.sh | 296 -----
source3/script/mkbuildoptions.awk | 1 -
source3/web/cgi.c | 798 -------------
source3/web/diagnose.c | 80 --
source3/web/neg_lang.c | 120 --
source3/web/startstop.c | 130 --
source3/web/statuspage.c | 467 --------
source3/web/swat.c | 1683 +--------------------------
source3/web/swat_proto.h | 76 --
source3/wscript | 4 -
source3/wscript_build | 33 -
source4/smbd/server.c | 1 -
swat/help/welcome-no-samba-doc.html | 3 -
swat/help/welcome.html | 63 -
swat/images/globals.gif | Bin 2004 -> 0 bytes
swat/images/home.gif | Bin 2044 -> 0 bytes
swat/images/passwd.gif | Bin 1993 -> 0 bytes
swat/images/printers.gif | Bin 2077 -> 0 bytes
swat/images/samba.gif | Bin 3643 -> 0 bytes
swat/images/shares.gif | Bin 2006 -> 0 bytes
swat/images/status.gif | Bin 2080 -> 0 bytes
swat/images/viewconfig.gif | Bin 1939 -> 0 bytes
swat/images/wizard.gif | Bin 2554 -> 0 bytes
swat/include/footer.html | 3 -
swat/include/header.html | 11 -
swat/lang/ja/help/welcome.html | 66 --
swat/lang/ru/help/welcome-no-samba-doc.html | 6 -
swat/lang/ru/help/welcome.html | 65 -
swat/lang/ru/images/globals.gif | Bin 2041 -> 0 bytes
swat/lang/ru/images/home.gif | Bin 2190 -> 0 bytes
swat/lang/ru/images/passwd.gif | Bin 1936 -> 0 bytes
swat/lang/ru/images/printers.gif | Bin 2139 -> 0 bytes
swat/lang/ru/images/shares.gif | Bin 2081 -> 0 bytes
swat/lang/ru/images/status.gif | Bin 2305 -> 0 bytes
swat/lang/ru/images/viewconfig.gif | Bin 2096 -> 0 bytes
swat/lang/ru/images/wizard.gif | Bin 2605 -> 0 bytes
swat/lang/ru/include/header.html | 14 -
swat/lang/tr/help/welcome.html | 66 --
swat/lang/tr/images/globals.gif | Bin 442 -> 0 bytes
swat/lang/tr/images/home.gif | Bin 608 -> 0 bytes
swat/lang/tr/images/passwd.gif | Bin 326 -> 0 bytes
swat/lang/tr/images/printers.gif | Bin 519 -> 0 bytes
swat/lang/tr/images/samba.gif | Bin 3643 -> 0 bytes
swat/lang/tr/images/shares.gif | Bin 474 -> 0 bytes
swat/lang/tr/images/status.gif | Bin 431 -> 0 bytes
swat/lang/tr/images/viewconfig.gif | Bin 455 -> 0 bytes
69 files changed, 41 insertions(+), 10235 deletions(-)
delete mode 100644 examples/misc/swat.pl
delete mode 100644 source3/m4/swat.m4
delete mode 100644 source3/po/de.msg
delete mode 100644 source3/po/en.msg
delete mode 100644 source3/po/fi.msg
delete mode 100644 source3/po/fr.msg
delete mode 100755 source3/po/genmsg
delete mode 100644 source3/po/it.msg
delete mode 100644 source3/po/ja.msg
delete mode 100644 source3/po/nl.msg
delete mode 100644 source3/po/pl.msg
delete mode 100644 source3/po/ru.msg
delete mode 100644 source3/po/tr.msg
delete mode 100644 source3/script/installmsg.sh
delete mode 100755 source3/script/installswat.sh
delete mode 100644 source3/web/cgi.c
delete mode 100644 source3/web/diagnose.c
delete mode 100644 source3/web/neg_lang.c
delete mode 100644 source3/web/startstop.c
delete mode 100644 source3/web/statuspage.c
delete mode 100644 source3/web/swat_proto.h
delete mode 100644 swat/help/welcome-no-samba-doc.html
delete mode 100644 swat/help/welcome.html
delete mode 100644 swat/images/globals.gif
delete mode 100644 swat/images/home.gif
delete mode 100644 swat/images/passwd.gif
delete mode 100644 swat/images/printers.gif
delete mode 100644 swat/images/samba.gif
delete mode 100644 swat/images/shares.gif
delete mode 100644 swat/images/status.gif
delete mode 100644 swat/images/viewconfig.gif
delete mode 100644 swat/images/wizard.gif
delete mode 100644 swat/include/footer.html
delete mode 100644 swat/include/header.html
delete mode 100644 swat/lang/ja/help/welcome.html
delete mode 100644 swat/lang/ru/help/welcome-no-samba-doc.html
delete mode 100644 swat/lang/ru/help/welcome.html
delete mode 100644 swat/lang/ru/images/globals.gif
delete mode 100644 swat/lang/ru/images/home.gif
delete mode 100644 swat/lang/ru/images/passwd.gif
delete mode 100644 swat/lang/ru/images/printers.gif
delete mode 100644 swat/lang/ru/images/shares.gif
delete mode 100644 swat/lang/ru/images/status.gif
delete mode 100644 swat/lang/ru/images/viewconfig.gif
delete mode 100644 swat/lang/ru/images/wizard.gif
delete mode 100644 swat/lang/ru/include/header.html
delete mode 100644 swat/lang/tr/help/welcome.html
delete mode 100644 swat/lang/tr/images/globals.gif
delete mode 100644 swat/lang/tr/images/home.gif
delete mode 100644 swat/lang/tr/images/passwd.gif
delete mode 100644 swat/lang/tr/images/printers.gif
delete mode 100644 swat/lang/tr/images/samba.gif
delete mode 100644 swat/lang/tr/images/shares.gif
delete mode 100644 swat/lang/tr/images/status.gif
delete mode 100644 swat/lang/tr/images/viewconfig.gif
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_patterns.py b/buildtools/wafsamba/samba_patterns.py
index 615d918..4db5eea 100644
--- a/buildtools/wafsamba/samba_patterns.py
+++ b/buildtools/wafsamba/samba_patterns.py
@@ -110,7 +110,6 @@ def write_build_options_header(fp):
fp.write(" output(screen,\"\\nPaths:\\n\");\n")
fp.write(" output(screen,\" SBINDIR: %s\\n\", get_dyn_SBINDIR());\n")
fp.write(" output(screen,\" BINDIR: %s\\n\", get_dyn_BINDIR());\n")
- fp.write(" output(screen,\" SWATDIR: %s\\n\", get_dyn_SWATDIR());\n")
fp.write(" output(screen,\" CONFIGFILE: %s\\n\", get_dyn_CONFIGFILE());\n")
fp.write(" output(screen,\" LOGFILEBASE: %s\\n\", get_dyn_LOGFILEBASE());\n")
fp.write(" output(screen,\" LMHOSTSFILE: %s\\n\",get_dyn_LMHOSTSFILE());\n")
diff --git a/dynconfig/config.m4 b/dynconfig/config.m4
index 6b5dfdb..fe69abe 100644
--- a/dynconfig/config.m4
+++ b/dynconfig/config.m4
@@ -27,7 +27,6 @@ if test x$enable_fhs != xyes; then
INCLUDEDIR="${includedir}"
SETUPDIR="${datadir}/setup"
PKGCONFIGDIR="${libdir}/pkgconfig"
- SWATDIR="${datadir}/swat"
CODEPAGEDIR="${datadir}/codepages"
PAMMODULESDIR="${libdir}/security"
CONFIGDIR="\${sysconfdir}"
@@ -46,7 +45,6 @@ else
INCLUDEDIR="${includedir}/samba-4.0"
SETUPDIR="${datadir}/samba/setup"
PKGCONFIGDIR="${libdir}/pkgconfig"
- SWATDIR="${datadir}/samba/swat"
CODEPAGEDIR="${datadir}/samba/codepages"
PAMMODULESDIR="${libdir}/security"
CONFIGDIR="\${sysconfdir}/samba"
@@ -279,7 +277,6 @@ AC_SUBST(MODULESDIR)
AC_SUBST(INCLUDEDIR)
AC_SUBST(SETUPDIR)
AC_SUBST(PKGCONFIGDIR)
-AC_SUBST(SWATDIR)
AC_SUBST(CODEPAGEDIR)
AC_SUBST(PAMMODULESDIR)
AC_SUBST(CONFIGDIR)
diff --git a/dynconfig/dynconfig.c b/dynconfig/dynconfig.c
index 79332a2..9fd7108 100644
--- a/dynconfig/dynconfig.c
+++ b/dynconfig/dynconfig.c
@@ -86,7 +86,6 @@ const char *set_dyn_##name(const char *newpath) \
/* these are in common with s3 */
DEFINE_DYN_CONFIG_PARAM(SBINDIR)
DEFINE_DYN_CONFIG_PARAM(BINDIR)
-DEFINE_DYN_CONFIG_PARAM(SWATDIR)
DEFINE_DYN_CONFIG_PARAM(CONFIGFILE) /**< Location of smb.conf file. **/
DEFINE_DYN_CONFIG_PARAM(LOGFILEBASE) /** Log file directory. **/
DEFINE_DYN_CONFIG_PARAM(LMHOSTSFILE) /** Statically configured LanMan hosts. **/
diff --git a/dynconfig/dynconfig.h b/dynconfig/dynconfig.h
index e53cd8f..4d24001 100644
--- a/dynconfig/dynconfig.h
+++ b/dynconfig/dynconfig.h
@@ -33,7 +33,6 @@ bool is_default_dyn_##name(void);
/* these are in common with s3 */
DEFINE_DYN_CONFIG_PROTO(SBINDIR)
DEFINE_DYN_CONFIG_PROTO(BINDIR)
-DEFINE_DYN_CONFIG_PROTO(SWATDIR)
DEFINE_DYN_CONFIG_PROTO(CONFIGFILE) /**< Location of smb.conf file. **/
DEFINE_DYN_CONFIG_PROTO(LOGFILEBASE) /** Log file directory. **/
DEFINE_DYN_CONFIG_PROTO(LMHOSTSFILE) /** Statically configured LanMan hosts. **/
diff --git a/dynconfig/wscript b/dynconfig/wscript
index d1c7a00..aa4e66e 100755
--- a/dynconfig/wscript
+++ b/dynconfig/wscript
@@ -128,10 +128,6 @@ dynconfig = {
'STD-PATH': '${LIBDIR}/pkgconfig',
'FHS-PATH': '${LIBDIR}/pkgconfig',
},
- 'SWATDIR' : {
- 'STD-PATH': '${DATADIR}/swat',
- 'FHS-PATH': '${DATADIR}/samba/swat',
- },
'CODEPAGEDIR' : {
'STD-PATH': '${DATADIR}/codepages',
'FHS-PATH': '${DATADIR}/samba/codepages',
diff --git a/examples/misc/swat.pl b/examples/misc/swat.pl
deleted file mode 100644
index f6414b6..0000000
--- a/examples/misc/swat.pl
+++ /dev/null
@@ -1,122 +0,0 @@
-#! /usr/bin/perl5
-##
-## This is a simple script written by Herb Lewis @ SGI <herb at samba.org>
-## for reporting which parameters are supported by loadparm.c but
-## not by SWAT I just thought it looked fun and might be of interest to others
-## --jerry at samba.org
-##
-## Here is a little info on the usage and output format so you don't have
-## to dig through the code to understand what is printed.
-##
-## Useage: swat.pl [path_to_loadparm.c]
-##
-## The output consists of 4 columns of information
-## Option Name, Global Page, Share Page, Printer Page
-## The section separaters will also be printed (preceded by 16 *) to show
-## which options are grouped in the various sections.
-##
-## If the option name is preceded by an * it means this is a deprecated option.
-## If the option name is preceded by 5 spaces it means this is an alias for the
-## previous option.
-##
-## Under the Global Page, Share Page, and Printer Page columns there will be
-## one of 3 entries, BASIC, ADVANCED, or no. "BASIC" indicates this option will
-## show in the Basic View of that page in SWAT. "ADVANCED" indicates this
-## option will show in the Advanced View of that page in SWAT. "No" indicates
-## that this option is not available on that page in SWAT.
-##
-## Under the Global Page column, if an entry begins with an * it indicates that
-## this is actually specified in Samba as a "service parameter" not a "global
-## parameter" but you can set a default value for this on the Global Page in
-## SWAT.
-##
-## --herb at samba.org
-
-$lastone = "nothing";
-
-if (@ARGV[0]) {
- $filename = @ARGV[0];
-} else {
- $filename = "/usr3/samba20/samba/source/param/loadparm.c";
-}
-
-open (INFILE,$filename) || die "unable to open $filename\n";
-while (not eof(INFILE))
-{
- $_ = <INFILE>;
- last if ( /^static struct parm_struct parm_table/) ;
-}
-print "Option Name Global Page Share Page Printer Page\n";
-print "---------------------------------------------------------------------";
-while (not eof(INFILE))
-{
- $_ = <INFILE>;
- last if (/};/);
- @fields = split(/,/,$_);
- next if not ($fields[0] =~ /^.*{"/);
- $fields[0] =~ s/.*{"//;
- $fields[0] =~ s/"//;
- if ($fields[3] eq $lastone) {
- print " $fields[0]\n";
- next;
- }
- $lastone = $fields[3];
- $fields[2] =~ s/^\s+//;
- $fields[2] =~ s/\s+$//;
- $fields[2] =~ s/}.*$//;
- $fields[6] =~ s/^\s+//;
- $fields[6] =~ s/\s+$//;
- $fields[6] =~ s/}.*$//;
- if ($fields[2] =~ /P_SEPARATOR/) {
- print "\n****************$fields[0]\n";
- next;
- }
- else {
- if ($fields[6] =~ /FLAG_DEPRECATED/) {
- print "*$fields[0]".' 'x(31-length($fields[0]));
- }
- else {
- print "$fields[0]".' 'x(32-length($fields[0]));
- }
- }
- if (($fields[2] =~ /P_GLOBAL/) || ($fields[6] =~ /FLAG_GLOBAL/)) {
- if ($fields[6] =~ /FLAG_GLOBAL/) {
- print "*";
- }
- else {
- print " ";
- }
- if ($fields[6] =~ /FLAG_BASIC/) {
- print "BASIC ";
- }
- else {
- print "ADVANCED ";
- }
- }
- else {
- print " no ";
- }
- if ($fields[6] =~ /FLAG_SHARE/) {
- if ($fields[6] =~ /FLAG_BASIC/) {
- print "BASIC ";
- }
- else {
- print "ADVANCED ";
- }
- }
- else {
- print "no ";
- }
- if ($fields[6] =~ /FLAG_PRINT/) {
- if ($fields[6] =~ /FLAG_BASIC/) {
- print "BASIC";
- }
- else {
- print "ADVANCED";
- }
- }
- else {
- print "no";
- }
- print "\n";
-}
diff --git a/source3/Makefile.in b/source3/Makefile.in
index d55a9cd..efe0694 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -31,7 +31,6 @@ MODULESDIR=@MODULESDIR@
INCLUDEDIR=@INCLUDEDIR@
SETUPDIR=@SETUPDIR@
#PKGCONFIGDIR=@PKGCONFIGDIR@
-SWATDIR=@SWATDIR@
CODEPAGEDIR=@CODEPAGEDIR@
PAMMODULESDIR=@PAMMODULESDIR@
CONFIGDIR=@CONFIGDIR@
@@ -187,7 +186,6 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \
-DSBINDIR=\"$(SBINDIR)\" \
-DBINDIR=\"$(BINDIR)\" \
-DLMHOSTSFILE=\"$(LMHOSTSFILE)\" \
- -DSWATDIR=\"$(SWATDIR)\" \
-DLOCKDIR=\"$(LOCKDIR)\" \
-DPIDDIR=\"$(PIDDIR)\" \
-DLIBDIR=\"$(LIBDIR)\" \
@@ -213,7 +211,7 @@ TDBS_DEPS=$(TDB_DEPS) $(NTDB_DEPS)
# Note that all executable programs now provide for an optional executable suffix.
-SBIN_PROGS = bin/smbd bin/nmbd @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@
+SBIN_PROGS = bin/smbd bin/nmbd @EXTRA_SBIN_PROGS@
BIN_PROGS1 = bin/smbclient bin/net bin/smbspool \
bin/testparm bin/smbstatus bin/smbget \
@@ -1061,10 +1059,6 @@ NMBD_OBJ = $(NMBD_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
$(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \
$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ)
-SWAT_OBJ1 = web/cgi.o web/diagnose.o web/startstop.o web/statuspage.o \
- web/swat.o web/neg_lang.o
-
-SWAT_OBJ = $(SWAT_OBJ1) $(SMBD_OBJ_BASE) $(PASSCHANGE_OBJ)
STATUS_OBJ = utils/status.o utils/status_profile.o $(SMBD_OBJ_BASE)
@@ -1881,14 +1875,6 @@ bin/nmbd: $(BINARY_PREREQS) $(NMBD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS) $(L
$(LIBTALLOC_LIBS) $(LIBTDBS_LIBS) $(POPT_LIBS) \
$(KRB5LIBS) $(LDAP_LIBS) $(ZLIB_LIBS)
-bin/swat: $(BINARY_PREREQS) $(SWAT_OBJ) $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT) @BUILD_POPT@
- @echo Linking $@
- @$(CC) -o $@ $(SWAT_OBJ) $(LDFLAGS) $(LDAP_LIBS) @SMBD_FAM_LIBS@ \
- $(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
- $(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) $(DNSSD_LIBS) $(AVAHI_LIBS) \
- $(POPT_LIBS) @SMBD_LIBS@ $(LIBTALLOC_LIBS) $(LIBTDBS_LIBS) \
- $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
-
bin/rpcclient: $(BINARY_PREREQS) $(RPCCLIENT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT)
@echo Linking $@
@$(CC) -o $@ $(LDFLAGS) $(RPCCLIENT_OBJ) \
@@ -3074,7 +3060,7 @@ bin/split_tokens: $(BINARY_PREREQS) $(SPLIT_TOKENS_OBJ) @BUILD_POPT@ $(LIBTALLOC
$(LIBTALLOC_LIBS) $(LIBTDBS_LIBS)
install:: installservers installbin installman \
- installscripts installdat installmodules @SWAT_INSTALL_TARGETS@ \
+ installscripts installdat installmodules \
@INSTALL_PAM_MODULES@ installlibs installmo
install-everything:: install installmodules
@@ -3124,12 +3110,6 @@ installscripts:: installdirs
installdat:: installdirs
@$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR) $(CODEPAGEDIR) $(srcdir)
-installmsg:: installdirs
- @$(SHELL) $(srcdir)/script/installmsg.sh $(DESTDIR) $(CODEPAGEDIR) $(srcdir)
-
-installswat:: installdirs installmsg
- @$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR) $(SWATDIR) $(srcdir)
-
installpammodules:: $(PAM_MODULES)
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(PAMMODULESDIR)
@for module in $(PAM_MODULES); do \
@@ -3172,7 +3152,6 @@ showlayout::
@echo " INCLUDEDIR: $(INCLUDEDIR)"
@echo " SETUPDIR: $(SETUPDIR)"
# @echo " PKGCONFIGDIR: $(PKGCONFIGDIR)"
- @echo " SWATDIR: $(SWATDIR)"
@echo " CODEPAGEDIR: $(CODEPAGEDIR)"
@echo " PAMMODULESDIR: $(PAMMODULESDIR)"
@echo " CONFIGDIR: $(CONFIGDIR)"
@@ -3194,7 +3173,7 @@ showlayout::
@echo " SMB_PASSWD_FILE: $(SMB_PASSWD_FILE)"
-uninstall:: uninstallmo uninstallman uninstallservers uninstallbin uninstallscripts uninstalldat uninstallswat uninstallmodules uninstalllibs @UNINSTALL_PAM_MODULES@
+uninstall:: uninstallmo uninstallman uninstallservers uninstallbin uninstallscripts uninstalldat uninstallmodules uninstalllibs @UNINSTALL_PAM_MODULES@
uninstallmo::
@$(SHELL) $(srcdir)/script/uninstallmo.sh $(DESTDIR) $(LOCALEDIR) $(srcdir)
@@ -3222,12 +3201,6 @@ uninstallscripts::
uninstalldat::
@$(SHELL) $(srcdir)/script/uninstalldat.sh $(DESTDIR) $(LIBDIR) $(srcdir)
-uninstallmsg::
- @$(SHELL) $(srcdir)/script/uninstallmsg.sh $(DESTDIR) $(LIBDIR) $(srcdir)
-
-uninstallswat:: uninstallmsg
- @$(SHELL) $(srcdir)/script/uninstallswat.sh $(DESTDIR) $(SWATDIR) $(srcdir)
-
uninstallpammodules::
@for module in $(PAM_MODULES); do \
echo "Removing $(DESTDIR)/$(PAMMODULESDIR)/$${module}. at SHLIBEXT@ "; \
diff --git a/source3/configure.in b/source3/configure.in
index 8fef7b1..822c5f4 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -128,8 +128,6 @@ m4_include(../lib/socket_wrapper/config.m4)
m4_include(../lib/nss_wrapper/config.m4)
m4_include(../lib/uid_wrapper/config.m4)
-m4_include(m4/swat.m4)
-
DEVELOPER_CFLAGS="-DDEBUG_PASSWORD -DDEVELOPER"
# Probe the gcc version for extra CFLAGS. We always stash these in
diff --git a/source3/lib/popt_common.c b/source3/lib/popt_common.c
index 1ec8619..eb3e2a4 100644
--- a/source3/lib/popt_common.c
+++ b/source3/lib/popt_common.c
@@ -203,7 +203,6 @@ struct poptOption popt_common_option[] = {
/* Handle command line options:
* --sbindir
* --bindir
- * --swatdir
* --lmhostsfile
* --libdir
* --modulesdir
@@ -219,7 +218,6 @@ struct poptOption popt_common_option[] = {
enum dyn_item{
DYN_SBINDIR = 1,
DYN_BINDIR,
- DYN_SWATDIR,
DYN_LMHOSTSFILE,
DYN_LIBDIR,
DYN_MODULESDIR,
@@ -252,12 +250,6 @@ static void popt_dynconfig_callback(poptContext con,
}
break;
- case DYN_SWATDIR:
- if (arg) {
- set_dyn_SWATDIR(arg);
- }
- break;
-
case DYN_LMHOSTSFILE:
if (arg) {
set_dyn_LMHOSTSFILE(arg);
@@ -329,8 +321,6 @@ const struct poptOption popt_common_dynconfig[] = {
"Path to sbin directory", "SBINDIR" },
{ "bindir", '\0' , POPT_ARG_STRING, NULL, DYN_BINDIR,
"Path to bin directory", "BINDIR" },
- { "swatdir", '\0' , POPT_ARG_STRING, NULL, DYN_SWATDIR,
- "Path to SWAT installation directory", "SWATDIR" },
{ "lmhostsfile", '\0' , POPT_ARG_STRING, NULL, DYN_LMHOSTSFILE,
"Path to lmhosts file", "LMHOSTSFILE" },
{ "libdir", '\0' , POPT_ARG_STRING, NULL, DYN_LIBDIR,
diff --git a/source3/m4/swat.m4 b/source3/m4/swat.m4
deleted file mode 100644
index cfff8fb..0000000
--- a/source3/m4/swat.m4
+++ /dev/null
@@ -1,27 +0,0 @@
-dnl
-dnl Samba3 build environment SWAT configuration
-dnl
-dnl Copyright (C) Michael Adam 2008
-dnl
-dnl Released under the GNU General Public License
-dnl http://www.gnu.org/licenses/
-dnl
-
-
-SWAT_SBIN_TARGETS='bin/swat'
-SWAT_INSTALL_TARGETS=installswat
-
-AC_ARG_ENABLE(swat,
-[AS_HELP_STRING([--enable-swat], [Build the SWAT tool (default=yes)])],
-[
- case "$enable_swat" in
- no)
- SWAT_SBIN_TARGETS=''
- SWAT_INSTALL_TARGETS=''
- ;;
- esac
-])
-
-AC_SUBST(SWAT_SBIN_TARGETS)
-AC_SUBST(SWAT_INSTALL_TARGETS)
-
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index d1c2a63..b9d316b 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4006,7 +4006,7 @@ void lp_killservice(int iServiceIn)
/***************************************************************************
Save the curent values of all global and sDefault parameters into the
- defaults union. This allows swat and testparm to show only the
+ defaults union. This allows testparm to show only the
changed (ie. non-default) parameters.
***************************************************************************/
diff --git a/source3/po/de.msg b/source3/po/de.msg
deleted file mode 100644
index 31baaf7..0000000
--- a/source3/po/de.msg
+++ /dev/null
@@ -1,616 +0,0 @@
-# German messages for international release of SWAT.
-# Copyright (C) 2001 Andreas Moroder
-# Copyright (C) 2007 Helge Kreutzmann, <debian at helgefjell.de>
-#
-# 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 3 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, see <http://www.gnu.org/licenses/>.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: swat\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-04 18:15+0200\n"
-"PO-Revision-Date: 2007-06-10 11:52+0200\n"
-"Last-Translator: Helge Kreutzmann <debian at helgefjell.de>\n"
-"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../web/swat.c:139
-#, c-format
-msgid "ERROR: Can't open %s"
-msgstr "FEHLER: Kann %s nicht öffnen"
-
-#: ../web/swat.c:223
-msgid "Help"
-msgstr "Hilfe"
-
-#: ../web/swat.c:229 ../web/swat.c:254 ../web/swat.c:275 ../web/swat.c:285
-#: ../web/swat.c:294 ../web/swat.c:303 ../web/swat.c:309 ../web/swat.c:315
-#: ../web/swat.c:328
-msgid "Set Default"
-msgstr "Standardwert setzen"
-
-#: ../web/swat.c:450
-#, c-format
-msgid "failed to open %s for writing"
-msgstr "konnte %s nicht zum Schreiben öffnen"
-
-#: ../web/swat.c:473
-#, c-format
-msgid "Can't reload %s"
-msgstr "Kann %s nicht erneut laden"
-
-#: ../web/swat.c:543
-#, c-format
-msgid "Logged in as <b>%s</b>"
-msgstr "Verbunden als <b>%s</b>"
-
-#: ../web/swat.c:547
-msgid "Home"
-msgstr "Home"
-
-#: ../web/swat.c:549
-msgid "Globals"
-msgstr "Globals"
-
-#: ../web/swat.c:550
-msgid "Shares"
-msgstr "Freigaben"
-
-#: ../web/swat.c:551
-msgid "Printers"
-msgstr "Drucker"
-
-#: ../web/swat.c:552
-msgid "Wizard"
-msgstr "Assistent"
-
--
Samba Shared Repository
More information about the samba-cvs
mailing list