summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--buildtools/wafsamba/samba_patterns.py1
-rw-r--r--dynconfig/config.m43
-rw-r--r--dynconfig/dynconfig.c1
-rw-r--r--dynconfig/dynconfig.h1
-rwxr-xr-xdynconfig/wscript4
-rw-r--r--examples/misc/swat.pl122
-rw-r--r--source3/Makefile.in33
-rw-r--r--source3/configure.in2
-rw-r--r--source3/lib/popt_common.c10
-rw-r--r--source3/m4/swat.m427
-rw-r--r--source3/param/loadparm.c2
-rw-r--r--source3/po/de.msg616
-rw-r--r--source3/po/en.msg592
-rw-r--r--source3/po/fi.msg610
-rw-r--r--source3/po/fr.msg592
-rwxr-xr-xsource3/po/genmsg40
-rw-r--r--source3/po/it.msg592
-rw-r--r--source3/po/ja.msg594
-rw-r--r--source3/po/nl.msg592
-rw-r--r--source3/po/pl.msg592
-rw-r--r--source3/po/ru.msg606
-rw-r--r--source3/po/tr.msg593
-rw-r--r--source3/script/installmsg.sh65
-rwxr-xr-xsource3/script/installswat.sh296
-rw-r--r--source3/script/mkbuildoptions.awk1
-rw-r--r--source3/web/cgi.c798
-rw-r--r--source3/web/diagnose.c80
-rw-r--r--source3/web/neg_lang.c120
-rw-r--r--source3/web/startstop.c130
-rw-r--r--source3/web/statuspage.c467
-rw-r--r--source3/web/swat.c1683
-rw-r--r--source3/web/swat_proto.h76
-rw-r--r--source3/wscript4
-rwxr-xr-xsource3/wscript_build33
-rw-r--r--source4/smbd/server.c1
-rw-r--r--swat/help/welcome-no-samba-doc.html3
-rw-r--r--swat/help/welcome.html63
-rw-r--r--swat/images/globals.gifbin2004 -> 0 bytes
-rw-r--r--swat/images/home.gifbin2044 -> 0 bytes
-rw-r--r--swat/images/passwd.gifbin1993 -> 0 bytes
-rw-r--r--swat/images/printers.gifbin2077 -> 0 bytes
-rw-r--r--swat/images/samba.gifbin3643 -> 0 bytes
-rw-r--r--swat/images/shares.gifbin2006 -> 0 bytes
-rw-r--r--swat/images/status.gifbin2080 -> 0 bytes
-rw-r--r--swat/images/viewconfig.gifbin1939 -> 0 bytes
-rw-r--r--swat/images/wizard.gifbin2554 -> 0 bytes
-rw-r--r--swat/include/footer.html3
-rw-r--r--swat/include/header.html11
-rw-r--r--swat/lang/ja/help/welcome.html66
-rw-r--r--swat/lang/ru/help/welcome-no-samba-doc.html6
-rw-r--r--swat/lang/ru/help/welcome.html65
-rw-r--r--swat/lang/ru/images/globals.gifbin2041 -> 0 bytes
-rw-r--r--swat/lang/ru/images/home.gifbin2190 -> 0 bytes
-rw-r--r--swat/lang/ru/images/passwd.gifbin1936 -> 0 bytes
-rw-r--r--swat/lang/ru/images/printers.gifbin2139 -> 0 bytes
-rw-r--r--swat/lang/ru/images/shares.gifbin2081 -> 0 bytes
-rw-r--r--swat/lang/ru/images/status.gifbin2305 -> 0 bytes
-rw-r--r--swat/lang/ru/images/viewconfig.gifbin2096 -> 0 bytes
-rw-r--r--swat/lang/ru/images/wizard.gifbin2605 -> 0 bytes
-rw-r--r--swat/lang/ru/include/header.html14
-rw-r--r--swat/lang/tr/help/welcome.html66
-rw-r--r--swat/lang/tr/images/globals.gifbin442 -> 0 bytes
-rw-r--r--swat/lang/tr/images/home.gifbin608 -> 0 bytes
-rw-r--r--swat/lang/tr/images/passwd.gifbin326 -> 0 bytes
-rw-r--r--swat/lang/tr/images/printers.gifbin519 -> 0 bytes
-rw-r--r--swat/lang/tr/images/samba.gifbin3643 -> 0 bytes
-rw-r--r--swat/lang/tr/images/shares.gifbin474 -> 0 bytes
-rw-r--r--swat/lang/tr/images/status.gifbin431 -> 0 bytes
-rw-r--r--swat/lang/tr/images/viewconfig.gifbin455 -> 0 bytes
69 files changed, 41 insertions, 10235 deletions
diff --git a/buildtools/wafsamba/samba_patterns.py b/buildtools/wafsamba/samba_patterns.py
index 615d918ba6..4db5eea7d6 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 6b5dfdbadd..fe69abeee4 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 79332a226d..9fd7108da4 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 e53cd8ff5f..4d24001fcb 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 d1c7a00f77..aa4e66e9d8 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 f6414b6349..0000000000
--- 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@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@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@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 d55a9cddf9..efe0694444 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}.@SHLIBEXT@ "; \
diff --git a/source3/configure.in b/source3/configure.in
index 8fef7b19b1..822c5f4442 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 1ec861906c..eb3e2a455c 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 cfff8fb3bb..0000000000
--- 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 d1c2a6383e..b9d316b98e 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 31baaf794c..0000000000
--- 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@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@helgefjell.de>\n"
-"Language-Team: German <debian-l10n-german@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"
-
-#: ../web/swat.c:556
-msgid "Status"
-msgstr "Status"
-
-#: ../web/swat.c:557
-msgid "View Config"
-msgstr "Zeige Konfiguration"
-
-#: ../web/swat.c:559
-msgid "Password Management"
-msgstr "Passwortverwaltung"
-
-#: ../web/swat.c:569
-msgid "Current View Is"
-msgstr "Aktuelle Ansicht lautet"
-
-#: ../web/swat.c:570 ../web/swat.c:573
-msgid "Basic"
-msgstr "Einfache Ansicht"
-
-#: ../web/swat.c:571 ../web/swat.c:574
-msgid "Advanced"
-msgstr "Erweiterte Ansicht"
-
-#: ../web/swat.c:572
-msgid "Change View To"
-msgstr "Ansicht ändern in"
-
-#: ../web/swat.c:601
-msgid "Current Config"
-msgstr "Aktuelle Konfiguration"
-
-#: ../web/swat.c:605
-msgid "Normal View"
-msgstr "Normale Ansicht"
-
-#: ../web/swat.c:607
-msgid "Full View"
-msgstr "Komplette Ansicht"
-
-#. Here we first set and commit all the parameters that were selected
-#. in the previous screen.
-#: ../web/swat.c:626
-msgid "Wizard Parameter Edit Page"
-msgstr "Bearbeitungsseite der Assistenten-Parameter"
-
-#: ../web/swat.c:655
-msgid "Note: smb.conf file has been read and rewritten"
-msgstr "Hinweis: smb.conf wurde gelesen und überschrieben"
-
-#. Here we go ...
-#: ../web/swat.c:763
-msgid "Samba Configuration Wizard"
-msgstr "Samba-Konfigurationsassistent"
-
-#: ../web/swat.c:767
-msgid ""
-"The \"Rewrite smb.conf file\" button will clear the smb.conf file of all "
-"default values and of comments."
-msgstr ""
-"Der Knopf »Schreibe smb.conf neu« wird alle Kommentare und Standardwerte "
-"aus der smb.conf löschen."
-
-#: ../web/swat.c:768
-msgid "The same will happen if you press the commit button."
-msgstr "Das gleiche passiert beim Knopf »übernehmen«."
-
-#: ../web/swat.c:771
-msgid "Rewrite smb.conf file"
-msgstr "Schreibe smb.conf neu"
-
-#: ../web/swat.c:772
-msgid "Commit"
-msgstr "Übernehmen"
-
-#: ../web/swat.c:773
-msgid "Edit Parameter Values"
-msgstr "Bearbeite Parameterwerte"
-
-#: ../web/swat.c:779
-msgid "Server Type"
-msgstr "Server-Typ"
-
-#: ../web/swat.c:780
-msgid "Stand Alone"
-msgstr "Einzelserver"
-
-#: ../web/swat.c:781
-msgid "Domain Member"
-msgstr "Domänenmitglied"
-
-#: ../web/swat.c:782
-msgid "Domain Controller"
-msgstr "Domänencontroller"
-
-#: ../web/swat.c:785
-msgid "Unusual Type in smb.conf - Please Select New Mode"
-msgstr ""
-"Ungewöhnlicher Typ in der smb.conf - Bitte wählen Sie einen neuen Modus"
-
-#: ../web/swat.c:787
-msgid "Configure WINS As"
-msgstr "Konfiguriere WINS als"
-
-#: ../web/swat.c:788
-msgid "Not Used"
-msgstr "Nicht benutzt"
-
-#: ../web/swat.c:789
-msgid "Server for client use"
-msgstr "Server für Client-Verwendung"
-
-#: ../web/swat.c:790
-msgid "Client of another WINS server"
-msgstr "Client eines anderen WINS-Servers"
-
-#: ../web/swat.c:792
-msgid "Remote WINS Server"
-msgstr "Entfernter WINS-Server:"
-
-#: ../web/swat.c:803
-msgid "Error: WINS Server Mode and WINS Support both set in smb.conf"
-msgstr ""
-"Fehler: Sowohl WINS-Server-Modus als auch WINS-Unterstützung in smb.conf "
-"aktiviert"
-
-#: ../web/swat.c:804
-msgid "Please Select desired WINS mode above."
-msgstr "Bitte wählen Sie den gewünschten WINS-Modus oben aus."
-
-#: ../web/swat.c:806
-msgid "Expose Home Directories"
-msgstr "Home-Verzeichnisse freigeben"
-
-#: ../web/swat.c:821
-msgid ""
-"The above configuration options will set multiple parameters and will "
-"generally assist with rapid Samba deployment."
-msgstr ""
-"Die obigen Konfigurationsoptionen bearbeiten mehrere Parameter und dienen als "
-"Hilfe zur schnellen Samba-Einrichtung."
-
-#: ../web/swat.c:834
-msgid "Global Parameters"
-msgstr "Globale Parameter"
-
-#: ../web/swat.c:862 ../web/swat.c:966 ../web/swat.c:1318
-msgid "Commit Changes"
-msgstr "Änderungen speichern"
-
-#: ../web/swat.c:866 ../web/swat.c:969 ../web/swat.c:1320
-msgid "Reset Values"
-msgstr "Werte zurücksetzen"
-
-#: ../web/swat.c:891
-msgid "Share Parameters"
-msgstr "Parameter der Freigabe"
-
-#: ../web/swat.c:934
-msgid "Choose Share"
-msgstr "Wähle Freigabe"
-
-#: ../web/swat.c:951
-msgid "Delete Share"
-msgstr "Lösche Freigabe"
-
-#: ../web/swat.c:958
-msgid "Create Share"
-msgstr "Erstelle Freigabe"
-
-#: ../web/swat.c:994
-msgid "password change in demo mode rejected"
-msgstr "Änderung des Passworts im Demo-Modus nicht möglich"
-
-#: ../web/swat.c:1007
-msgid "Can't setup password database vectors."
-msgstr "Kann Passwort-Datenbankvektoren nicht einrichten"
-
-#: ../web/swat.c:1033
-msgid " Must specify \"User Name\" "
-msgstr " »Benutzername« muss angegeben werden "
-
-#: ../web/swat.c:1049
-msgid " Must specify \"Old Password\" "
-msgstr " »Altes Passwort« muss angegeben werden "
-
-#: ../web/swat.c:1055
-msgid " Must specify \"Remote Machine\" "
-msgstr " »Entfernter Server« muss angegeben werden "
-
-#: ../web/swat.c:1062
-msgid " Must specify \"New, and Re-typed Passwords\" "
-msgstr " »Neues/wiederholtes Passwort« muss angegeben werden "
-
-#: ../web/swat.c:1068
-msgid " Re-typed password didn't match new password "
-msgstr " Das wiederholte Passwort stimmt nicht mit dem neuen Passwort überein"
-
-#: ../web/swat.c:1101
-#, c-format
-msgid " The passwd for '%s' has been changed."
-msgstr " Das Passwort für '%s' wurde geändert."
-
-#: ../web/swat.c:1104
-#, c-format
-msgid " The passwd for '%s' has NOT been changed."
-msgstr " Das Passwort für '%s' wurde NICHT geändert."
-
-#: ../web/swat.c:1129
-msgid "Server Password Management"
-msgstr "Verwaltung des Server-Passwortes"
-
-#.
-#. * Create all the dialog boxes for data collection
-#.
-#: ../web/swat.c:1138 ../web/swat.c:1185
-msgid "User Name"
-msgstr "Benutzername"
-
-#: ../web/swat.c:1141 ../web/swat.c:1187
-msgid "Old Password"
-msgstr "Altes Passwort"
-
-#: ../web/swat.c:1144 ../web/swat.c:1189
-msgid "New Password"
-msgstr "Neues Passwort"
-
-#: ../web/swat.c:1146 ../web/swat.c:1191
-msgid "Re-type New Password"
-msgstr "Wiederhole neues Passwort"
-
-#: ../web/swat.c:1154 ../web/swat.c:1202
-msgid "Change Password"
-msgstr "Ändere Passwort"
-
-#: ../web/swat.c:1157
-msgid "Add New User"
-msgstr "Füge neuen Benutzer hinzu"
-
-#: ../web/swat.c:1159
-msgid "Delete User"
-msgstr "Lösche Benutzer"
-
-#: ../web/swat.c:1161
-msgid "Disable User"
-msgstr "Deaktiviere Benutzer"
-
-#: ../web/swat.c:1163
-msgid "Enable User"
-msgstr "Aktiviere Benutzer"
-
-#: ../web/swat.c:1176
-msgid "Client/Server Password Management"
-msgstr "Client/Server Passwort-Verwaltung"
-
-#: ../web/swat.c:1193
-msgid "Remote Machine"
-msgstr "Entfernte Maschine"
-
-#: ../web/swat.c:1232
-msgid "Printer Parameters"
-msgstr "Drucker-Parameter"
-
-#: ../web/swat.c:1234
-msgid "Important Note:"
-msgstr "Wichtiger Hinweis:"
-
-#: ../web/swat.c:1235
-#, c-format
-msgid "Printer names marked with [*] in the Choose Printer drop-down box "
-msgstr "Mit [*] gekennzeichnete Drucker in der »Wähle Drucker«-Auswahlliste "
-
-#: ../web/swat.c:1236
-#, c-format
-msgid "are autoloaded printers from "
-msgstr "sind automatisch geladene Drucker aus "
-
-#: ../web/swat.c:1237
-msgid "Printcap Name"
-msgstr "Printcap-Name"
-
-#: ../web/swat.c:1238
-msgid "Attempting to delete these printers from SWAT will have no effect."
-msgstr ""
-"Der Versuch, diese Drucker von SWAT aus zu löschen, wird keine Auswirkung "
-"haben."
-
-#: ../web/swat.c:1284
-msgid "Choose Printer"
-msgstr "Wähle Drucker"
-
-#: ../web/swat.c:1303
-msgid "Delete Printer"
-msgstr "Lösche Drucker"
-
-#: ../web/swat.c:1310
-msgid "Create Printer"
-msgstr "Erstelle Drucker"
-
-#: ../web/statuspage.c:139
-msgid "RDWR "
-msgstr "LESE/SCHREIBE "
-
-#: ../web/statuspage.c:141
-msgid "WRONLY "
-msgstr "NUR SCHREIBE "
-
-#: ../web/statuspage.c:143
-msgid "RDONLY "
-msgstr "NUR LESE "
-
-#: ../web/statuspage.c:330
-msgid "Server Status"
-msgstr "Server-Status"
-
-#: ../web/statuspage.c:335
-msgid "Auto Refresh"
-msgstr "Automatische Aktualisierung"
-
-#: ../web/statuspage.c:336 ../web/statuspage.c:341
-msgid "Refresh Interval: "
-msgstr "Aktualisierungsintervall: "
-
-#: ../web/statuspage.c:340
-msgid "Stop Refreshing"
-msgstr "Stoppe Aktualisierung"
-
-#: ../web/statuspage.c:355
-msgid "version:"
-msgstr "Version:"
-
-#: ../web/statuspage.c:358
-msgid "smbd:"
-msgstr "smbd:"
-
-#: ../web/statuspage.c:358 ../web/statuspage.c:371 ../web/statuspage.c:385
-msgid "running"
-msgstr "aktiv"
-
-#: ../web/statuspage.c:358 ../web/statuspage.c:371 ../web/statuspage.c:385
-msgid "not running"
-msgstr "inaktiv"
-
-#: ../web/statuspage.c:362
-msgid "Stop smbd"
-msgstr "Stoppe smbd"
-
-#: ../web/statuspage.c:364
-msgid "Start smbd"
-msgstr "Starte smbd"
-
-#: ../web/statuspage.c:366
-msgid "Restart smbd"
-msgstr "Starte smbd neu"
-
-#: ../web/statuspage.c:371
-msgid "nmbd:"
-msgstr "nmbd:"
-
-#: ../web/statuspage.c:375
-msgid "Stop nmbd"
-msgstr "Stoppe nmbd"
-
-#: ../web/statuspage.c:377
-msgid "Start nmbd"
-msgstr "Starte nmbd"
-
-#: ../web/statuspage.c:379
-msgid "Restart nmbd"
-msgstr "Starte nmbd neu"
-
-#: ../web/statuspage.c:385
-msgid "winbindd:"
-msgstr "winbindd:"
-
-#: ../web/statuspage.c:389
-msgid "Stop winbindd"
-msgstr "Stoppe winbindd"
-
-#: ../web/statuspage.c:391
-msgid "Start winbindd"
-msgstr "Starte winbindd"
-
-#: ../web/statuspage.c:393
-msgid "Restart winbindd"
-msgstr "Starte winbindd neu"
-
-#. stop, restart all
-#: ../web/statuspage.c:402
-msgid "Stop All"
-msgstr "Alle Stoppen"
-
-#: ../web/statuspage.c:403
-msgid "Restart All"
-msgstr "Alle neu starten"
-
-#. start all
-#: ../web/statuspage.c:407
-msgid "Start All"
-msgstr "Alle starten"
-
-#: ../web/statuspage.c:414
-msgid "Active Connections"
-msgstr "Aktive Verbindungen"
-
-#: ../web/statuspage.c:416 ../web/statuspage.c:429 ../web/statuspage.c:437
-msgid "PID"
-msgstr "PID"
-
-#: ../web/statuspage.c:416 ../web/statuspage.c:429
-msgid "Client"
-msgstr "Client"
-
-#: ../web/statuspage.c:416
-msgid "IP address"
-msgstr "IP-Adresse"
-
-#: ../web/statuspage.c:416 ../web/statuspage.c:429 ../web/statuspage.c:437
-msgid "Date"
-msgstr "Datum"
-
-#: ../web/statuspage.c:418
-msgid "Kill"
-msgstr "Töten"
-
-#: ../web/statuspage.c:426
-msgid "Active Shares"
-msgstr "Aktive Freigaben"
-
-#: ../web/statuspage.c:429
-msgid "Share"
-msgstr "Freigabe"
-
-#: ../web/statuspage.c:429
-msgid "User"
-msgstr "Benutzer"
-
-#: ../web/statuspage.c:429
-msgid "Group"
-msgstr "Gruppe"
-
-#: ../web/statuspage.c:435
-msgid "Open Files"
-msgstr "Offene Dateien"
-
-#: ../web/statuspage.c:437
-msgid "Sharing"
-msgstr "Freigeben"
-
-#: ../web/statuspage.c:437
-msgid "R/W"
-msgstr "Lese/Schreibe"
-
-#: ../web/statuspage.c:437
-msgid "Oplock"
-msgstr "Opportunistische Sperre (Lock)"
-
-#: ../web/statuspage.c:437
-msgid "File"
-msgstr "Datei"
-
-#: ../web/statuspage.c:446
-msgid "Show Client in col 1"
-msgstr "Zeige Client in Spalte 1"
-
-#: ../web/statuspage.c:447
-msgid "Show PID in col 1"
-msgstr "Zeige PID in Spalte 1"
-
-#: ../param/loadparm.c:836
-msgid "Base Options"
-msgstr "Basisoptionen"
-
-#: ../param/loadparm.c:855
-msgid "Security Options"
-msgstr "Sicherheitsoptionen"
-
-#: ../param/loadparm.c:945
-msgid "Logging Options"
-msgstr "Protokollier-Optionen"
-
-#: ../param/loadparm.c:962
-msgid "Protocol Options"
-msgstr "Protokoll-Optionen"
-
-#: ../param/loadparm.c:1008
-msgid "Tuning Options"
-msgstr "Optimierungsoptionen"
-
-#: ../param/loadparm.c:1037
-msgid "Printing Options"
-msgstr "Druckoptionen"
-
-#: ../param/loadparm.c:1075
-msgid "Filename Handling"
-msgstr "Dateinamen-Verwaltung"
-
-#: ../param/loadparm.c:1105
-msgid "Domain Options"
-msgstr "Domänen-Optionen"
-
-#: ../param/loadparm.c:1109
-msgid "Logon Options"
-msgstr "Anmelde-Optionen"
-
-#: ../param/loadparm.c:1130
-msgid "Browse Options"
-msgstr "Browsing-Optionen"
-
-#: ../param/loadparm.c:1144
-msgid "WINS Options"
-msgstr "WINS-Optionen"
-
-#: ../param/loadparm.c:1153
-msgid "Locking Options"
-msgstr "Locking-(Sperr-)Optionen"
-
-#: ../param/loadparm.c:1170
-msgid "Ldap Options"
-msgstr "LDAP-Optionen"
-
-#: ../param/loadparm.c:1186
-msgid "Miscellaneous Options"
-msgstr "Sonstige Optionen"
-
-#: ../param/loadparm.c:1191
-#| msgid "Logon Options"
-msgid "EventLog Options"
-msgstr "EventLog-Optionen"
-
-#: ../param/loadparm.c:1258
-msgid "VFS module options"
-msgstr "VFS-Modul-Optionen"
-
-#: ../param/loadparm.c:1268
-msgid "Winbind options"
-msgstr "Winbind-Optionen"
diff --git a/source3/po/en.msg b/source3/po/en.msg
deleted file mode 100644
index 01e6b6943b..0000000000
--- a/source3/po/en.msg
+++ /dev/null
@@ -1,592 +0,0 @@
-# English messages for international release of SWAT.
-# Copyright (C) 2003 TAKAHASHI Motonobu <monyo@samba.org>
-#
-# 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: i18n_swat \n"
-"POT-Creation-Date: 2003-10-06 05:30+0900\n"
-"PO-Revision-Date: 2000-02-08 12:48+09:00\n"
-"Last-Translator: TAKAHASHI Motonobu <monyo@samba.org>\n"
-"Language-Team: (Samba Team) <samba-technical@samba.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: \n"
-
-#: ../web/swat.c:117
-#, c-format
-msgid "ERROR: Can't open %s"
-msgstr ""
-
-#: ../web/swat.c:200
-msgid "Help"
-msgstr ""
-
-#: ../web/swat.c:206 ../web/swat.c:220 ../web/swat.c:235 ../web/swat.c:243 ../web/swat.c:252 ../web/swat.c:261 ../web/swat.c:267 ../web/swat.c:273 ../web/swat.c:286
-msgid "Set Default"
-msgstr ""
-
-#: ../web/swat.c:408
-#, c-format
-msgid "failed to open %s for writing"
-msgstr ""
-
-#: ../web/swat.c:431
-#, c-format
-msgid "Can't reload %s"
-msgstr ""
-
-#: ../web/swat.c:501
-#, c-format
-msgid "Logged in as <b>%s</b>"
-msgstr ""
-
-#: ../web/swat.c:505
-msgid "Home"
-msgstr ""
-
-#: ../web/swat.c:507
-msgid "Globals"
-msgstr ""
-
-#: ../web/swat.c:508
-msgid "Shares"
-msgstr ""
-
-#: ../web/swat.c:509
-msgid "Printers"
-msgstr ""
-
-#: ../web/swat.c:510
-msgid "Wizard"
-msgstr ""
-
-#: ../web/swat.c:513
-msgid "Status"
-msgstr ""
-
-#: ../web/swat.c:514
-msgid "View Config"
-msgstr ""
-
-#: ../web/swat.c:516
-msgid "Password Management"
-msgstr ""
-
-#: ../web/swat.c:526
-msgid "Current View Is"
-msgstr ""
-
-#: ../web/swat.c:527 ../web/swat.c:530
-msgid "Basic"
-msgstr ""
-
-#: ../web/swat.c:528 ../web/swat.c:531
-msgid "Advanced"
-msgstr ""
-
-#: ../web/swat.c:529
-msgid "Change View To"
-msgstr ""
-
-#: ../web/swat.c:554
-msgid "Current Config"
-msgstr ""
-
-#: ../web/swat.c:558
-msgid "Normal View"
-msgstr ""
-
-#: ../web/swat.c:560
-msgid "Full View"
-msgstr ""
-
-#. Here we first set and commit all the parameters that were selected
-#. in the previous screen.
-#: ../web/swat.c:579
-msgid "Wizard Parameter Edit Page"
-msgstr ""
-
-#: ../web/swat.c:608
-msgid "Note: smb.conf file has been read and rewritten"
-msgstr ""
-
-#. Here we go ...
-#: ../web/swat.c:716
-msgid "Samba Configuration Wizard"
-msgstr ""
-
-#: ../web/swat.c:720
-msgid "The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."
-msgstr ""
-
-#: ../web/swat.c:721
-msgid "The same will happen if you press the commit button."
-msgstr ""
-
-#: ../web/swat.c:724
-msgid "Rewrite smb.conf file"
-msgstr ""
-
-#: ../web/swat.c:725
-msgid "Commit"
-msgstr ""
-
-#: ../web/swat.c:726
-msgid "Edit Parameter Values"
-msgstr ""
-
-#: ../web/swat.c:732
-msgid "Server Type"
-msgstr ""
-
-#: ../web/swat.c:733
-msgid "Stand Alone"
-msgstr ""
-
-#: ../web/swat.c:734
-msgid "Domain Member"
-msgstr ""
-
-#: ../web/swat.c:735
-msgid "Domain Controller"
-msgstr ""
-
-#: ../web/swat.c:738
-msgid "Unusual Type in smb.conf - Please Select New Mode"
-msgstr ""
-
-#: ../web/swat.c:740
-msgid "Configure WINS As"
-msgstr ""
-
-#: ../web/swat.c:741
-msgid "Not Used"
-msgstr ""
-
-#: ../web/swat.c:742
-msgid "Server for client use"
-msgstr ""
-
-#: ../web/swat.c:743
-msgid "Client of another WINS server"
-msgstr ""
-
-#: ../web/swat.c:745
-msgid "Remote WINS Server"
-msgstr ""
-
-#: ../web/swat.c:756
-msgid "Error: WINS Server Mode and WINS Support both set in smb.conf"
-msgstr ""
-
-#: ../web/swat.c:757
-msgid "Please Select desired WINS mode above."
-msgstr ""
-
-#: ../web/swat.c:759
-msgid "Expose Home Directories"
-msgstr ""
-
-#: ../web/swat.c:774
-msgid "The above configuration options will set multiple parameters and will generally assist with rapid Samba deployment."
-msgstr ""
-
-#: ../web/swat.c:787
-msgid "Global Parameters"
-msgstr ""
-
-#: ../web/swat.c:815 ../web/swat.c:916 ../web/swat.c:1265
-msgid "Commit Changes"
-msgstr ""
-
-#: ../web/swat.c:819 ../web/swat.c:919 ../web/swat.c:1267
-msgid "Reset Values"
-msgstr ""
-
-#: ../web/swat.c:844
-msgid "Share Parameters"
-msgstr ""
-
-#: ../web/swat.c:887
-msgid "Choose Share"
-msgstr ""
-
-#: ../web/swat.c:901
-msgid "Delete Share"
-msgstr ""
-
-#: ../web/swat.c:908
-msgid "Create Share"
-msgstr ""
-
-#: ../web/swat.c:944
-msgid "password change in demo mode rejected"
-msgstr ""
-
-#: ../web/swat.c:957
-msgid "Can't setup password database vectors."
-msgstr ""
-
-#: ../web/swat.c:983
-msgid " Must specify \"User Name\" "
-msgstr ""
-
-#: ../web/swat.c:999
-msgid " Must specify \"Old Password\" "
-msgstr ""
-
-#: ../web/swat.c:1005
-msgid " Must specify \"Remote Machine\" "
-msgstr ""
-
-#: ../web/swat.c:1012
-msgid " Must specify \"New, and Re-typed Passwords\" "
-msgstr ""
-
-#: ../web/swat.c:1018
-msgid " Re-typed password didn't match new password "
-msgstr ""
-
-#: ../web/swat.c:1048
-#, c-format
-msgid " The passwd for '%s' has been changed."
-msgstr ""
-
-#: ../web/swat.c:1051
-#, c-format
-msgid " The passwd for '%s' has NOT been changed."
-msgstr ""
-
-#: ../web/swat.c:1076
-msgid "Server Password Management"
-msgstr ""
-
-#.
-#. * Create all the dialog boxes for data collection
-#.
-#: ../web/swat.c:1085 ../web/swat.c:1132
-msgid "User Name"
-msgstr ""
-
-#: ../web/swat.c:1088 ../web/swat.c:1134
-msgid "Old Password"
-msgstr ""
-
-#: ../web/swat.c:1091 ../web/swat.c:1136
-msgid "New Password"
-msgstr ""
-
-#: ../web/swat.c:1093 ../web/swat.c:1138
-msgid "Re-type New Password"
-msgstr ""
-
-#: ../web/swat.c:1101 ../web/swat.c:1149
-msgid "Change Password"
-msgstr ""
-
-#: ../web/swat.c:1104
-msgid "Add New User"
-msgstr ""
-
-#: ../web/swat.c:1106
-msgid "Delete User"
-msgstr ""
-
-#: ../web/swat.c:1108
-msgid "Disable User"
-msgstr ""
-
-#: ../web/swat.c:1110
-msgid "Enable User"
-msgstr ""
-
-#: ../web/swat.c:1123
-msgid "Client/Server Password Management"
-msgstr ""
-
-#: ../web/swat.c:1140
-msgid "Remote Machine"
-msgstr ""
-
-#: ../web/swat.c:1179
-msgid "Printer Parameters"
-msgstr ""
-
-#: ../web/swat.c:1181
-msgid "Important Note:"
-msgstr ""
-
-#: ../web/swat.c:1182
-msgid "Printer names marked with [*] in the Choose Printer drop-down box "
-msgstr ""
-
-#: ../web/swat.c:1183
-msgid "are autoloaded printers from "
-msgstr ""
-
-#: ../web/swat.c:1184
-msgid "Printcap Name"
-msgstr ""
-
-#: ../web/swat.c:1185
-msgid "Attempting to delete these printers from SWAT will have no effect."
-msgstr ""
-
-#: ../web/swat.c:1231
-msgid "Choose Printer"
-msgstr ""
-
-#: ../web/swat.c:1250
-msgid "Delete Printer"
-msgstr ""
-
-#: ../web/swat.c:1257
-msgid "Create Printer"
-msgstr ""
-
-#: ../web/statuspage.c:123
-msgid "RDONLY "
-msgstr ""
-
-#: ../web/statuspage.c:124
-msgid "WRONLY "
-msgstr ""
-
-#: ../web/statuspage.c:125
-msgid "RDWR "
-msgstr ""
-
-#: ../web/statuspage.c:309
-msgid "Server Status"
-msgstr ""
-
-#: ../web/statuspage.c:314
-msgid "Auto Refresh"
-msgstr ""
-
-#: ../web/statuspage.c:315 ../web/statuspage.c:320
-msgid "Refresh Interval: "
-msgstr ""
-
-#: ../web/statuspage.c:319
-msgid "Stop Refreshing"
-msgstr ""
-
-#: ../web/statuspage.c:334
-msgid "version:"
-msgstr ""
-
-#: ../web/statuspage.c:337
-msgid "smbd:"
-msgstr ""
-
-#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
-msgid "running"
-msgstr ""
-
-#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
-msgid "not running"
-msgstr ""
-
-#: ../web/statuspage.c:341
-msgid "Stop smbd"
-msgstr ""
-
-#: ../web/statuspage.c:343
-msgid "Start smbd"
-msgstr ""
-
-#: ../web/statuspage.c:345
-msgid "Restart smbd"
-msgstr ""
-
-#: ../web/statuspage.c:350
-msgid "nmbd:"
-msgstr ""
-
-#: ../web/statuspage.c:354
-msgid "Stop nmbd"
-msgstr ""
-
-#: ../web/statuspage.c:356
-msgid "Start nmbd"
-msgstr ""
-
-#: ../web/statuspage.c:358
-msgid "Restart nmbd"
-msgstr ""
-
-#: ../web/statuspage.c:364
-msgid "winbindd:"
-msgstr ""
-
-#: ../web/statuspage.c:368
-msgid "Stop winbindd"
-msgstr ""
-
-#: ../web/statuspage.c:370
-msgid "Start winbindd"
-msgstr ""
-
-#: ../web/statuspage.c:372
-msgid "Restart winbindd"
-msgstr ""
-
-#. stop, restart all
-#: ../web/statuspage.c:381
-msgid "Stop All"
-msgstr ""
-
-#: ../web/statuspage.c:382
-msgid "Restart All"
-msgstr ""
-
-#. start all
-#: ../web/statuspage.c:386
-msgid "Start All"
-msgstr ""
-
-#: ../web/statuspage.c:393
-msgid "Active Connections"
-msgstr ""
-
-#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
-msgid "PID"
-msgstr ""
-
-#: ../web/statuspage.c:395 ../web/statuspage.c:408
-msgid "Client"
-msgstr ""
-
-#: ../web/statuspage.c:395
-msgid "IP address"
-msgstr ""
-
-#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
-msgid "Date"
-msgstr ""
-
-#: ../web/statuspage.c:397
-msgid "Kill"
-msgstr ""
-
-#: ../web/statuspage.c:405
-msgid "Active Shares"
-msgstr ""
-
-#: ../web/statuspage.c:408
-msgid "Share"
-msgstr ""
-
-#: ../web/statuspage.c:408
-msgid "User"
-msgstr ""
-
-#: ../web/statuspage.c:408
-msgid "Group"
-msgstr ""
-
-#: ../web/statuspage.c:414
-msgid "Open Files"
-msgstr ""
-
-#: ../web/statuspage.c:416
-msgid "Sharing"
-msgstr ""
-
-#: ../web/statuspage.c:416
-msgid "R/W"
-msgstr ""
-
-#: ../web/statuspage.c:416
-msgid "Oplock"
-msgstr ""
-
-#: ../web/statuspage.c:416
-msgid "File"
-msgstr ""
-
-#: ../web/statuspage.c:425
-msgid "Show Client in col 1"
-msgstr ""
-
-#: ../web/statuspage.c:426
-msgid "Show PID in col 1"
-msgstr ""
-
-#: ../param/loadparm.c:755
-msgid "Base Options"
-msgstr ""
-
-#: ../param/loadparm.c:775
-msgid "Security Options"
-msgstr ""
-
-#: ../param/loadparm.c:859
-msgid "Logging Options"
-msgstr ""
-
-#: ../param/loadparm.c:874
-msgid "Protocol Options"
-msgstr ""
-
-#: ../param/loadparm.c:911
-msgid "Tuning Options"
-msgstr ""
-
-#: ../param/loadparm.c:940
-msgid "Printing Options"
-msgstr ""
-
-#: ../param/loadparm.c:970
-msgid "Filename Handling"
-msgstr ""
-
-#: ../param/loadparm.c:996
-msgid "Domain Options"
-msgstr ""
-
-#: ../param/loadparm.c:1000
-msgid "Logon Options"
-msgstr ""
-
-#: ../param/loadparm.c:1019
-msgid "Browse Options"
-msgstr ""
-
-#: ../param/loadparm.c:1033
-msgid "WINS Options"
-msgstr ""
-
-#: ../param/loadparm.c:1043
-msgid "Locking Options"
-msgstr ""
-
-#: ../param/loadparm.c:1061
-msgid "Ldap Options"
-msgstr ""
-
-#: ../param/loadparm.c:1078
-msgid "Miscellaneous Options"
-msgstr ""
-
-#: ../param/loadparm.c:1138
-msgid "VFS module options"
-msgstr ""
-
-#: ../param/loadparm.c:1148
-msgid "Winbind options"
-msgstr ""
diff --git a/source3/po/fi.msg b/source3/po/fi.msg
deleted file mode 100644
index e039311aa8..0000000000
--- a/source3/po/fi.msg
+++ /dev/null
@@ -1,610 +0,0 @@
-# Finnish messages for international release of SWAT.
-# Copyright (C) 2007 Lauri Nurmi <lanurmi@iki.fi>
-#
-# 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: i18n_swat \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-02 01:56+0200\n"
-"PO-Revision-Date: 2007-01-12 18:56+0200\n"
-"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
-"Language-Team: Finnish <laatu@lokalisointi.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: \n"
-
-#: ../web/swat.c:139
-#, c-format
-msgid "ERROR: Can't open %s"
-msgstr "VIRHE: Avaaminen ei onnistu — %s"
-
-#: ../web/swat.c:223
-msgid "Help"
-msgstr "Ohje"
-
-#: ../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 "Oletusarvo"
-
-#: ../web/swat.c:450
-#, c-format
-msgid "failed to open %s for writing"
-msgstr "avaaminen kirjoitustilassa ei onnistu — %s"
-
-#: ../web/swat.c:473
-#, c-format
-msgid "Can't reload %s"
-msgstr "Uudelleen lataaminen ei onnistu — %s"
-
-#: ../web/swat.c:543
-#, c-format
-msgid "Logged in as <b>%s</b>"
-msgstr "Sisäänkirjautuminen käyttäjänä <b>%s</b>"
-
-#: ../web/swat.c:547
-msgid "Home"
-msgstr "Koti"
-
-#: ../web/swat.c:549
-msgid "Globals"
-msgstr "Yleiset"
-
-#: ../web/swat.c:550
-msgid "Shares"
-msgstr "Jaot"
-
-#: ../web/swat.c:551
-msgid "Printers"
-msgstr "Tulostimet"
-
-#: ../web/swat.c:552
-msgid "Wizard"
-msgstr "Ohjatut asetukset"
-
-#: ../web/swat.c:556
-msgid "Status"
-msgstr "Tila"
-
-#: ../web/swat.c:557
-msgid "View Config"
-msgstr "Näytä asetukset"
-
-#: ../web/swat.c:559
-msgid "Password Management"
-msgstr "Salasanojen hallinta"
-
-#: ../web/swat.c:569
-msgid "Current View Is"
-msgstr "Näkymä nyt"
-
-#: ../web/swat.c:570 ../web/swat.c:573
-msgid "Basic"
-msgstr "Tavallinen"
-
-#: ../web/swat.c:571 ../web/swat.c:574
-msgid "Advanced"
-msgstr "Laajennettu"
-
-#: ../web/swat.c:572
-msgid "Change View To"
-msgstr "Vaihda näkymäksi"
-
-#: ../web/swat.c:601
-msgid "Current Config"
-msgstr "Nykyiset asetukset"
-
-#: ../web/swat.c:605
-msgid "Normal View"
-msgstr "Normaali näkymä"
-
-#: ../web/swat.c:607
-msgid "Full View"
-msgstr "Täysi näkymä"
-
-#. Here we first set and commit all the parameters that were selected
-#. in the previous screen.
-#: ../web/swat.c:626
-msgid "Wizard Parameter Edit Page"
-msgstr "Ohjattujen asetusten muokkaussivu"
-
-#: ../web/swat.c:655
-msgid "Note: smb.conf file has been read and rewritten"
-msgstr "Huom: smb.conf-tiedosto on luettu ja kirjoitettu uudelleen"
-
-#. Here we go ...
-#: ../web/swat.c:763
-msgid "Samba Configuration Wizard"
-msgstr "Samban ohjatut asetukset"
-
-#: ../web/swat.c:767
-msgid "The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."
-msgstr "”Kirjoita uudelleen smb.conf-tiedosto”-painike tyhjentää oletusarvot ja kommentit smb.conf-tiedostosta."
-
-#: ../web/swat.c:768
-msgid "The same will happen if you press the commit button."
-msgstr "Samoin tapahtuu ”Tallenna”-painiketta painettaessa."
-
-#: ../web/swat.c:771
-msgid "Rewrite smb.conf file"
-msgstr "Kirjoita uudelleen smb.conf-tiedosto"
-
-#: ../web/swat.c:772
-msgid "Commit"
-msgstr "Tallenna"
-
-#: ../web/swat.c:773
-msgid "Edit Parameter Values"
-msgstr "Muokkaa asetusten arvoja"
-
-#: ../web/swat.c:779
-msgid "Server Type"
-msgstr "Palvelimen tyyppi"
-
-#: ../web/swat.c:780
-msgid "Stand Alone"
-msgstr "Itsenäinen"
-
-# lähde: Microsoftin käännökset
-#: ../web/swat.c:781
-msgid "Domain Member"
-msgstr "Toimialuejäsen"
-
-# lähde: Microsoftin käännökset
-#: ../web/swat.c:782
-msgid "Domain Controller"
-msgstr "Toimialueen ohjauskone"
-
-#: ../web/swat.c:785
-msgid "Unusual Type in smb.conf - Please Select New Mode"
-msgstr "Epätavallinen tyyppi smb.confissa — Valitse uusi tila"
-
-#: ../web/swat.c:787
-msgid "Configure WINS As"
-msgstr "WINS"
-
-#: ../web/swat.c:788
-msgid "Not Used"
-msgstr "Ei käytössä"
-
-#: ../web/swat.c:789
-msgid "Server for client use"
-msgstr "Palvelimena"
-
-#: ../web/swat.c:790
-msgid "Client of another WINS server"
-msgstr "Käyttää WINS-etäpalvelinta"
-
-#: ../web/swat.c:792
-msgid "Remote WINS Server"
-msgstr "WINS-etäpalvelin"
-
-#: ../web/swat.c:803
-msgid "Error: WINS Server Mode and WINS Support both set in smb.conf"
-msgstr "Virhe: Sekä WINS-palvelintila että WINS-tuki asetettu smb.confissa"
-
-#: ../web/swat.c:804
-msgid "Please Select desired WINS mode above."
-msgstr "Valitse haluttu WINSin tila yltä."
-
-#: ../web/swat.c:806
-msgid "Expose Home Directories"
-msgstr "Jaa kotihakemistot"
-
-#: ../web/swat.c:821
-msgid "The above configuration options will set multiple parameters and will generally assist with rapid Samba deployment."
-msgstr "Yllä olevat valinnat asettavat useita asetuksia, ja auttavat Samban nopeassa käyttöönotossa."
-
-#: ../web/swat.c:834
-msgid "Global Parameters"
-msgstr "Yleisasetukset"
-
-#: ../web/swat.c:862 ../web/swat.c:966 ../web/swat.c:1318
-msgid "Commit Changes"
-msgstr "Tallenna muutokset"
-
-#: ../web/swat.c:866 ../web/swat.c:969 ../web/swat.c:1320
-msgid "Reset Values"
-msgstr "Kumoa muutokset"
-
-#: ../web/swat.c:891
-msgid "Share Parameters"
-msgstr "Jakoasetukset"
-
-#: ../web/swat.c:934
-msgid "Choose Share"
-msgstr "Valitse jako"
-
-#: ../web/swat.c:951
-msgid "Delete Share"
-msgstr "Poista jako"
-
-#: ../web/swat.c:958
-msgid "Create Share"
-msgstr "Luo jako"
-
-#: ../web/swat.c:994
-msgid "password change in demo mode rejected"
-msgstr "salasanan muutos estetty esittelytilassa"
-
-#: ../web/swat.c:1007
-msgid "Can't setup password database vectors."
-msgstr "Salasanatietokannan alustus epäonnistui."
-
-#: ../web/swat.c:1033
-msgid " Must specify \"User Name\" "
-msgstr " Käyttäjätunnus on annettava "
-
-#: ../web/swat.c:1049
-msgid " Must specify \"Old Password\" "
-msgstr " Vanha salasana on annettava "
-
-#: ../web/swat.c:1055
-msgid " Must specify \"Remote Machine\" "
-msgstr " Etäkone on annettava "
-
-#: ../web/swat.c:1062
-msgid " Must specify \"New, and Re-typed Passwords\" "
-msgstr " Uusi salasana on kirjoitettava kahdesti "
-
-#: ../web/swat.c:1068
-msgid " Re-typed password didn't match new password "
-msgstr " Salasanat eivät täsmää "
-
-#: ../web/swat.c:1101
-#, c-format
-msgid " The passwd for '%s' has been changed."
-msgstr " Käyttäjän ”%s” salasana vaihdettu."
-
-#: ../web/swat.c:1104
-#, c-format
-msgid " The passwd for '%s' has NOT been changed."
-msgstr " Käyttäjän ”%s” salasanaa EI vaihdettu."
-
-#: ../web/swat.c:1129
-msgid "Server Password Management"
-msgstr "Palvelimen salasanojen hallinta"
-
-#.
-#. * Create all the dialog boxes for data collection
-#.
-#: ../web/swat.c:1138 ../web/swat.c:1185
-msgid "User Name"
-msgstr "Käyttäjätunnus"
-
-#: ../web/swat.c:1141 ../web/swat.c:1187
-msgid "Old Password"
-msgstr "Vanha salasana"
-
-#: ../web/swat.c:1144 ../web/swat.c:1189
-msgid "New Password"
-msgstr "Uusi salasana"
-
-#: ../web/swat.c:1146 ../web/swat.c:1191
-msgid "Re-type New Password"
-msgstr "Uusi salasana uudelleen"
-
-#: ../web/swat.c:1154 ../web/swat.c:1202
-msgid "Change Password"
-msgstr "Vaihda salasana"
-
-#: ../web/swat.c:1157
-msgid "Add New User"
-msgstr "Lisää uusi käyttäjä"
-
-#: ../web/swat.c:1159
-msgid "Delete User"
-msgstr "Poista käyttäjä"
-
-# Joku suomenkielisempi olisi ehkä parempi.
-#: ../web/swat.c:1161
-msgid "Disable User"
-msgstr "Passivoi käyttäjä"
-
-# Joku suomenkielisempi olisi ehkä parempi.
-#: ../web/swat.c:1163
-msgid "Enable User"
-msgstr "Aktivoi käyttäjä"
-
-# hmm...
-#: ../web/swat.c:1176
-msgid "Client/Server Password Management"
-msgstr "Asiakas-palvelin-salasanojen hallinta"
-
-#: ../web/swat.c:1193
-msgid "Remote Machine"
-msgstr "Etäkone"
-
-#: ../web/swat.c:1232
-msgid "Printer Parameters"
-msgstr "Tulostinasetukset"
-
-#: ../web/swat.c:1234
-msgid "Important Note:"
-msgstr "Tärkeä huomautus:"
-
-#: ../web/swat.c:1235
-#, c-format
-msgid "Printer names marked with [*] in the Choose Printer drop-down box "
-msgstr "Tähdellä [*] merkityt tulostimien nimet pudotusvalikossa ovat "
-
-#: ../web/swat.c:1236
-#, c-format
-msgid "are autoloaded printers from "
-msgstr "automaattisesti ladattuja tulostimia "
-
-#: ../web/swat.c:1237
-msgid "Printcap Name"
-msgstr "Printcap Name -asetuksen osoittamasta paikasta"
-
-#: ../web/swat.c:1238
-msgid "Attempting to delete these printers from SWAT will have no effect."
-msgstr "Näiden tulostimien poistaminen ei onnistu SWATin kautta."
-
-#: ../web/swat.c:1284
-msgid "Choose Printer"
-msgstr "Valitse tulostin"
-
-#: ../web/swat.c:1303
-msgid "Delete Printer"
-msgstr "Poista tulostin"
-
-#: ../web/swat.c:1310
-msgid "Create Printer"
-msgstr "Luo tulostin"
-
-#: ../web/statuspage.c:139
-msgid "RDWR "
-msgstr "Luku+kirj. "
-
-#: ../web/statuspage.c:141
-msgid "WRONLY "
-msgstr "Vain kirj. "
-
-#: ../web/statuspage.c:143
-msgid "RDONLY "
-msgstr "Vain luku "
-
-#: ../web/statuspage.c:330
-msgid "Server Status"
-msgstr "Palvelimen tila"
-
-#: ../web/statuspage.c:335
-msgid "Auto Refresh"
-msgstr "Automaattinen päivitys"
-
-#: ../web/statuspage.c:336 ../web/statuspage.c:341
-msgid "Refresh Interval: "
-msgstr "Päivitysväli: "
-
-#: ../web/statuspage.c:340
-msgid "Stop Refreshing"
-msgstr "Lopeta päivitys"
-
-#: ../web/statuspage.c:355
-msgid "version:"
-msgstr "versio:"
-
-#: ../web/statuspage.c:358
-msgid "smbd:"
-msgstr "smbd:"
-
-#: ../web/statuspage.c:358 ../web/statuspage.c:371 ../web/statuspage.c:385
-msgid "running"
-msgstr "käynnissä"
-
-#: ../web/statuspage.c:358 ../web/statuspage.c:371 ../web/statuspage.c:385
-msgid "not running"
-msgstr "pysäytetty"
-
-#: ../web/statuspage.c:362
-msgid "Stop smbd"
-msgstr "Pysäytä smbd"
-
-#: ../web/statuspage.c:364
-msgid "Start smbd"
-msgstr "Käynnistä smbd"
-
-#: ../web/statuspage.c:366
-msgid "Restart smbd"
-msgstr "Käynnistä smbd uudelleen"
-
-#: ../web/statuspage.c:371
-msgid "nmbd:"
-msgstr "nmbd:"
-
-#: ../web/statuspage.c:375
-msgid "Stop nmbd"
-msgstr "Pysäytä nmbd"
-
-#: ../web/statuspage.c:377
-msgid "Start nmbd"
-msgstr "Käynnistä nmbd"
-
-#: ../web/statuspage.c:379
-msgid "Restart nmbd"
-msgstr "Käynnistä nmbd uudelleen"
-
-#: ../web/statuspage.c:385
-msgid "winbindd:"
-msgstr "winbindd:"
-
-#: ../web/statuspage.c:389
-msgid "Stop winbindd"
-msgstr "Pysäytä winbindd"
-
-#: ../web/statuspage.c:391
-msgid "Start winbindd"
-msgstr "Käynnistä winbindd"
-
-#: ../web/statuspage.c:393
-msgid "Restart winbindd"
-msgstr "Käynnistä winbindd uudelleen"
-
-#. stop, restart all
-#: ../web/statuspage.c:402
-msgid "Stop All"
-msgstr "Pysäytä kaikki"
-
-#: ../web/statuspage.c:403
-msgid "Restart All"
-msgstr "Käynnistä kaikki uudelleen"
-
-#. start all
-#: ../web/statuspage.c:407
-msgid "Start All"
-msgstr "Käynnistä kaikki"
-
-#: ../web/statuspage.c:414
-msgid "Active Connections"
-msgstr "Aktiiviset yhteydet"
-
-#: ../web/statuspage.c:416 ../web/statuspage.c:429 ../web/statuspage.c:437
-msgid "PID"
-msgstr "PID"
-
-#: ../web/statuspage.c:416 ../web/statuspage.c:429
-msgid "Client"
-msgstr "Asiakas"
-
-#: ../web/statuspage.c:416
-msgid "IP address"
-msgstr "IP-osoite"
-
-#: ../web/statuspage.c:416 ../web/statuspage.c:429 ../web/statuspage.c:437
-msgid "Date"
-msgstr "Aika"
-
-#: ../web/statuspage.c:418
-msgid "Kill"
-msgstr "Sulje"
-
-#: ../web/statuspage.c:426
-msgid "Active Shares"
-msgstr "Aktiiviset jaot"
-
-#: ../web/statuspage.c:429
-msgid "Share"
-msgstr "Jako"
-
-#: ../web/statuspage.c:429
-msgid "User"
-msgstr "Käyttäjä"
-
-#: ../web/statuspage.c:429
-msgid "Group"
-msgstr "Ryhmä"
-
-#: ../web/statuspage.c:435
-msgid "Open Files"
-msgstr "Avoimet tiedostot"
-
-# Tämä on ilmeisesti palvelimen puolella vallitseva UID.
-#: ../web/statuspage.c:437
-msgid "Sharing"
-msgstr "Jakaja"
-
-#: ../web/statuspage.c:437
-msgid "R/W"
-msgstr "Luku/kirj."
-
-# Selitys:
-# "Oplocks is a unique Windows file locking feature. It is not really file
-# locking, but is included in most discussions of Windows file locking, so
-# is considered a de facto locking feature."
-# Suomennos: ???
-#: ../web/statuspage.c:437
-msgid "Oplock"
-msgstr "Oplock"
-
-#: ../web/statuspage.c:437
-msgid "File"
-msgstr "Tiedosto"
-
-#: ../web/statuspage.c:446
-msgid "Show Client in col 1"
-msgstr "Näytä asiakas 1. sarakkeessa"
-
-#: ../web/statuspage.c:447
-msgid "Show PID in col 1"
-msgstr "Näytä PID 1. sarakkeessa"
-
-#: ../param/loadparm.c:834
-msgid "Base Options"
-msgstr "Perusasetukset"
-
-#: ../param/loadparm.c:853
-msgid "Security Options"
-msgstr "Turvallisuusasetukset"
-
-#: ../param/loadparm.c:943
-msgid "Logging Options"
-msgstr "Lokiasetukset"
-
-#: ../param/loadparm.c:959
-msgid "Protocol Options"
-msgstr "Protokolla-asetukset"
-
-#: ../param/loadparm.c:1005
-msgid "Tuning Options"
-msgstr "Hienosäätöasetukset"
-
-#: ../param/loadparm.c:1035
-msgid "Printing Options"
-msgstr "Tulostusasetukset"
-
-#: ../param/loadparm.c:1072
-msgid "Filename Handling"
-msgstr "Tiedostonimien käsittely"
-
-#: ../param/loadparm.c:1102
-msgid "Domain Options"
-msgstr "Toimialueasetukset"
-
-#: ../param/loadparm.c:1106
-msgid "Logon Options"
-msgstr "Kirjautumisasetukset"
-
-#: ../param/loadparm.c:1127
-msgid "Browse Options"
-msgstr "Selausasetukset"
-
-#: ../param/loadparm.c:1141
-msgid "WINS Options"
-msgstr "WINS-asetukset"
-
-#: ../param/loadparm.c:1150
-msgid "Locking Options"
-msgstr "Lukitusasetukset"
-
-#: ../param/loadparm.c:1168
-msgid "Ldap Options"
-msgstr "LDAP-asetukset"
-
-#: ../param/loadparm.c:1184
-msgid "Miscellaneous Options"
-msgstr "Sekalaiset asetukset"
-
-#: ../param/loadparm.c:1189
-msgid "EventLog Options"
-msgstr "Tapahtumalokiasetukset"
-
-#: ../param/loadparm.c:1257
-msgid "VFS module options"
-msgstr "VFS-moduulin asetukset"
-
-#: ../param/loadparm.c:1267
-msgid "Winbind options"
-msgstr "Winbind-asetukset"
diff --git a/source3/po/fr.msg b/source3/po/fr.msg
deleted file mode 100644
index aac900223e..0000000000
--- a/source3/po/fr.msg
+++ /dev/null
@@ -1,592 +0,0 @@
-# French messages for international release of SWAT.
-# Copyright (C) 2001 François Le Lay <fanch@tuxfamily.org>
-#
-# 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: i18n_swat \n"
-"POT-Creation-Date: 2003-10-06 05:30+0900\n"
-"PO-Revision-Date: 2000-02-08 14:45+0100\n"
-"Last-Translator: François Le Lay <fanch@tuxfamily.org>\n"
-"Language-Team: (Samba Team) <samba-technical@samba.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: \n"
-
-#: ../web/swat.c:117
-#, c-format
-msgid "ERROR: Can't open %s"
-msgstr ""
-
-#: ../web/swat.c:200
-msgid "Help"
-msgstr "Aide"
-
-#: ../web/swat.c:206 ../web/swat.c:220 ../web/swat.c:235 ../web/swat.c:243 ../web/swat.c:252 ../web/swat.c:261 ../web/swat.c:267 ../web/swat.c:273 ../web/swat.c:286
-msgid "Set Default"
-msgstr "Définir par défaut"
-
-#: ../web/swat.c:408
-#, c-format
-msgid "failed to open %s for writing"
-msgstr ""
-
-#: ../web/swat.c:431
-#, c-format
-msgid "Can't reload %s"
-msgstr ""
-
-#: ../web/swat.c:501
-#, c-format
-msgid "Logged in as <b>%s</b>"
-msgstr "Connecté en tant que <b>%s</b>"
-
-#: ../web/swat.c:505
-msgid "Home"
-msgstr "Home"
-
-#: ../web/swat.c:507
-msgid "Globals"
-msgstr "Paramètres Généraux"
-
-#: ../web/swat.c:508
-msgid "Shares"
-msgstr "Partages"
-
-#: ../web/swat.c:509
-msgid "Printers"
-msgstr "Imprimantes"
-
-#: ../web/swat.c:510
-msgid "Wizard"
-msgstr ""
-
-#: ../web/swat.c:513
-msgid "Status"
-msgstr "Statut"
-
-#: ../web/swat.c:514
-msgid "View Config"
-msgstr "Voir Configuration"
-
-#: ../web/swat.c:516
-msgid "Password Management"
-msgstr "Gestion des mots de passe"
-
-#: ../web/swat.c:526
-msgid "Current View Is"
-msgstr "Configuration Actuelle"
-
-#: ../web/swat.c:527 ../web/swat.c:530
-msgid "Basic"
-msgstr "Vue Basique"
-
-#: ../web/swat.c:528 ../web/swat.c:531
-msgid "Advanced"
-msgstr "Vue Détaillée"
-
-#: ../web/swat.c:529
-msgid "Change View To"
-msgstr "Modifier le mot de passe"
-
-#: ../web/swat.c:554
-msgid "Current Config"
-msgstr "Configuration Actuelle"
-
-#: ../web/swat.c:558
-msgid "Normal View"
-msgstr "Vue Normale"
-
-#: ../web/swat.c:560
-msgid "Full View"
-msgstr "Vue Complète"
-
-#. Here we first set and commit all the parameters that were selected
-#. in the previous screen.
-#: ../web/swat.c:579
-msgid "Wizard Parameter Edit Page"
-msgstr ""
-
-#: ../web/swat.c:608
-msgid "Note: smb.conf file has been read and rewritten"
-msgstr ""
-
-#. Here we go ...
-#: ../web/swat.c:716
-msgid "Samba Configuration Wizard"
-msgstr ""
-
-#: ../web/swat.c:720
-msgid "The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."
-msgstr ""
-
-#: ../web/swat.c:721
-msgid "The same will happen if you press the commit button."
-msgstr ""
-
-#: ../web/swat.c:724
-msgid "Rewrite smb.conf file"
-msgstr ""
-
-#: ../web/swat.c:725
-msgid "Commit"
-msgstr "commentaire"
-
-#: ../web/swat.c:726
-msgid "Edit Parameter Values"
-msgstr "Paramètres Imprimantes"
-
-#: ../web/swat.c:732
-msgid "Server Type"
-msgstr ""
-
-#: ../web/swat.c:733
-msgid "Stand Alone"
-msgstr ""
-
-#: ../web/swat.c:734
-msgid "Domain Member"
-msgstr "master de domaine"
-
-#: ../web/swat.c:735
-msgid "Domain Controller"
-msgstr "master de domaine"
-
-#: ../web/swat.c:738
-msgid "Unusual Type in smb.conf - Please Select New Mode"
-msgstr ""
-
-#: ../web/swat.c:740
-msgid "Configure WINS As"
-msgstr ""
-
-#: ../web/swat.c:741
-msgid "Not Used"
-msgstr "ne pas descendre"
-
-#: ../web/swat.c:742
-msgid "Server for client use"
-msgstr ""
-
-#: ../web/swat.c:743
-msgid "Client of another WINS server"
-msgstr ""
-
-#: ../web/swat.c:745
-msgid "Remote WINS Server"
-msgstr ""
-
-#: ../web/swat.c:756
-msgid "Error: WINS Server Mode and WINS Support both set in smb.conf"
-msgstr ""
-
-#: ../web/swat.c:757
-msgid "Please Select desired WINS mode above."
-msgstr ""
-
-#: ../web/swat.c:759
-msgid "Expose Home Directories"
-msgstr ""
-
-#: ../web/swat.c:774
-msgid "The above configuration options will set multiple parameters and will generally assist with rapid Samba deployment."
-msgstr ""
-
-#: ../web/swat.c:787
-msgid "Global Parameters"
-msgstr "Variables Globales"
-
-#: ../web/swat.c:815 ../web/swat.c:916 ../web/swat.c:1265
-msgid "Commit Changes"
-msgstr "Sauver les modifications"
-
-#: ../web/swat.c:819 ../web/swat.c:919 ../web/swat.c:1267
-msgid "Reset Values"
-msgstr "Réinitialiser Valeurs"
-
-#: ../web/swat.c:844
-msgid "Share Parameters"
-msgstr "Paramètres de partage"
-
-#: ../web/swat.c:887
-msgid "Choose Share"
-msgstr "Choisir un partage"
-
-#: ../web/swat.c:901
-msgid "Delete Share"
-msgstr "Supprimer un partage"
-
-#: ../web/swat.c:908
-msgid "Create Share"
-msgstr "Créer un partage"
-
-#: ../web/swat.c:944
-msgid "password change in demo mode rejected"
-msgstr "changement de mot de passe en mode démo rejeté"
-
-#: ../web/swat.c:957
-msgid "Can't setup password database vectors."
-msgstr ""
-
-#: ../web/swat.c:983
-msgid " Must specify \"User Name\" "
-msgstr " Le champ \"Nom d'utilisateur\" doit être spécifié"
-
-#: ../web/swat.c:999
-msgid " Must specify \"Old Password\" "
-msgstr " Le champ \"Ancien mot de passe\" doît être spécifié"
-
-#: ../web/swat.c:1005
-msgid " Must specify \"Remote Machine\" "
-msgstr " Le champ \"Machine Distante\" doît être spécifié"
-
-#: ../web/swat.c:1012
-msgid " Must specify \"New, and Re-typed Passwords\" "
-msgstr "Les champs \"Nouveau mot de passe\" et \"Confirmation du nouveau mot de passe\" doivent être spécifiés \n"
-
-#: ../web/swat.c:1018
-msgid " Re-typed password didn't match new password "
-msgstr " Echec de la confirmation du nouveau mot de passe"
-
-#: ../web/swat.c:1048
-#, c-format
-msgid " The passwd for '%s' has been changed."
-msgstr " Le mot de passe de '%s' a été modifié. "
-
-#: ../web/swat.c:1051
-#, c-format
-msgid " The passwd for '%s' has NOT been changed."
-msgstr " Le mot de passe de '%s' n'a PAS été modifié. \n"
-
-#: ../web/swat.c:1076
-msgid "Server Password Management"
-msgstr "Gestion des mots de passe serveur"
-
-#.
-#. * Create all the dialog boxes for data collection
-#.
-#: ../web/swat.c:1085 ../web/swat.c:1132
-msgid "User Name"
-msgstr " Nom d'utilisateur : "
-
-#: ../web/swat.c:1088 ../web/swat.c:1134
-msgid "Old Password"
-msgstr " Ancien mot de passe : "
-
-#: ../web/swat.c:1091 ../web/swat.c:1136
-msgid "New Password"
-msgstr " Nouveau mot de passe : "
-
-#: ../web/swat.c:1093 ../web/swat.c:1138
-msgid "Re-type New Password"
-msgstr " Confirmation du nouveau mot de passe : "
-
-#: ../web/swat.c:1101 ../web/swat.c:1149
-msgid "Change Password"
-msgstr "Modifier le mot de passe"
-
-#: ../web/swat.c:1104
-msgid "Add New User"
-msgstr "Nouvel Utilisateur"
-
-#: ../web/swat.c:1106
-msgid "Delete User"
-msgstr "Supprimer Utilisateur"
-
-#: ../web/swat.c:1108
-msgid "Disable User"
-msgstr "Désactiver Utilisateur"
-
-#: ../web/swat.c:1110
-msgid "Enable User"
-msgstr "Activer Utilisateur"
-
-#: ../web/swat.c:1123
-msgid "Client/Server Password Management"
-msgstr "Gestion des mots de passe Client/Serveur"
-
-#: ../web/swat.c:1140
-msgid "Remote Machine"
-msgstr " Machine distante : "
-
-#: ../web/swat.c:1179
-msgid "Printer Parameters"
-msgstr "Paramètres Imprimantes"
-
-#: ../web/swat.c:1181
-msgid "Important Note:"
-msgstr "Note Importante:"
-
-#: ../web/swat.c:1182
-msgid "Printer names marked with [*] in the Choose Printer drop-down box "
-msgstr "Les Noms d'imprimantes marqués du signe [*] dans le menu déroulant Choisir Imprimante"
-
-#: ../web/swat.c:1183
-msgid "are autoloaded printers from "
-msgstr "désignent des imprimantes automatiquement chargées depuis le "
-
-#: ../web/swat.c:1184
-msgid "Printcap Name"
-msgstr "Nom Printcap"
-
-#: ../web/swat.c:1185
-msgid "Attempting to delete these printers from SWAT will have no effect."
-msgstr "Essayer de supprimer ces imprimantes depuis SWAT n'aura aucun effet."
-
-#: ../web/swat.c:1231
-msgid "Choose Printer"
-msgstr "Choisir Imprimante"
-
-#: ../web/swat.c:1250
-msgid "Delete Printer"
-msgstr "Supprimer Imprimante"
-
-#: ../web/swat.c:1257
-msgid "Create Printer"
-msgstr "Créer Imprimante"
-
-#: ../web/statuspage.c:123
-msgid "RDONLY "
-msgstr ""
-
-#: ../web/statuspage.c:124
-msgid "WRONLY "
-msgstr ""
-
-#: ../web/statuspage.c:125
-msgid "RDWR "
-msgstr ""
-
-#: ../web/statuspage.c:309
-msgid "Server Status"
-msgstr "Statut du Serveur"
-
-#: ../web/statuspage.c:314
-msgid "Auto Refresh"
-msgstr "Rafraîchissement Automatique"
-
-#: ../web/statuspage.c:315 ../web/statuspage.c:320
-msgid "Refresh Interval: "
-msgstr "Intervalle de rafraîchissement: "
-
-#: ../web/statuspage.c:319
-msgid "Stop Refreshing"
-msgstr "Stopper Rafraîchissement"
-
-#: ../web/statuspage.c:334
-msgid "version:"
-msgstr "version:"
-
-#: ../web/statuspage.c:337
-msgid "smbd:"
-msgstr ""
-
-#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
-msgid "running"
-msgstr "actif"
-
-#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
-msgid "not running"
-msgstr "non actif"
-
-#: ../web/statuspage.c:341
-msgid "Stop smbd"
-msgstr "Stopper smbd"
-
-#: ../web/statuspage.c:343
-msgid "Start smbd"
-msgstr "Lancer smbd"
-
-#: ../web/statuspage.c:345
-msgid "Restart smbd"
-msgstr "Relancer smbd"
-
-#: ../web/statuspage.c:350
-msgid "nmbd:"
-msgstr ""
-
-#: ../web/statuspage.c:354
-msgid "Stop nmbd"
-msgstr "Stopper nmbd"
-
-#: ../web/statuspage.c:356
-msgid "Start nmbd"
-msgstr "Lancer nmbd"
-
-#: ../web/statuspage.c:358
-msgid "Restart nmbd"
-msgstr "Relancer nmbd"
-
-#: ../web/statuspage.c:364
-msgid "winbindd:"
-msgstr ""
-
-#: ../web/statuspage.c:368
-msgid "Stop winbindd"
-msgstr "Stopper nmbd"
-
-#: ../web/statuspage.c:370
-msgid "Start winbindd"
-msgstr "Lancer nmbd"
-
-#: ../web/statuspage.c:372
-msgid "Restart winbindd"
-msgstr "Relancer nmbd"
-
-#. stop, restart all
-#: ../web/statuspage.c:381
-msgid "Stop All"
-msgstr ""
-
-#: ../web/statuspage.c:382
-msgid "Restart All"
-msgstr "Relancer nmbd"
-
-#. start all
-#: ../web/statuspage.c:386
-msgid "Start All"
-msgstr "Lancer nmbd"
-
-#: ../web/statuspage.c:393
-msgid "Active Connections"
-msgstr "Connections Actives"
-
-#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
-msgid "PID"
-msgstr ""
-
-#: ../web/statuspage.c:395 ../web/statuspage.c:408
-msgid "Client"
-msgstr ""
-
-#: ../web/statuspage.c:395
-msgid "IP address"
-msgstr "adresse IP"
-
-#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
-msgid "Date"
-msgstr "Date"
-
-#: ../web/statuspage.c:397
-msgid "Kill"
-msgstr "Terminer"
-
-#: ../web/statuspage.c:405
-msgid "Active Shares"
-msgstr "Partages Actifs"
-
-#: ../web/statuspage.c:408
-msgid "Share"
-msgstr "Partager"
-
-#: ../web/statuspage.c:408
-msgid "User"
-msgstr "Utilisateur"
-
-#: ../web/statuspage.c:408
-msgid "Group"
-msgstr "Groupe"
-
-#: ../web/statuspage.c:414
-msgid "Open Files"
-msgstr "Fichiers Ouverts"
-
-#: ../web/statuspage.c:416
-msgid "Sharing"
-msgstr ""
-
-#: ../web/statuspage.c:416
-msgid "R/W"
-msgstr ""
-
-#: ../web/statuspage.c:416
-msgid "Oplock"
-msgstr ""
-
-#: ../web/statuspage.c:416
-msgid "File"
-msgstr "Fichier"
-
-#: ../web/statuspage.c:425
-msgid "Show Client in col 1"
-msgstr ""
-
-#: ../web/statuspage.c:426
-msgid "Show PID in col 1"
-msgstr ""
-
-#: ../param/loadparm.c:755
-msgid "Base Options"
-msgstr "Options de base"
-
-#: ../param/loadparm.c:775
-msgid "Security Options"
-msgstr "Options de Sécurité"
-
-#: ../param/loadparm.c:859
-msgid "Logging Options"
-msgstr "Options de Logging"
-
-#: ../param/loadparm.c:874
-msgid "Protocol Options"
-msgstr "Options de Protocole"
-
-#: ../param/loadparm.c:911
-msgid "Tuning Options"
-msgstr "Options de réglage"
-
-#: ../param/loadparm.c:940
-msgid "Printing Options"
-msgstr "Options d'impression"
-
-#: ../param/loadparm.c:970
-msgid "Filename Handling"
-msgstr "Gestion des noms de fichier"
-
-#: ../param/loadparm.c:996
-msgid "Domain Options"
-msgstr "Options de Domaine"
-
-#: ../param/loadparm.c:1000
-msgid "Logon Options"
-msgstr "Options de Logon"
-
-#: ../param/loadparm.c:1019
-msgid "Browse Options"
-msgstr "Options de Navigation"
-
-#: ../param/loadparm.c:1033
-msgid "WINS Options"
-msgstr "Options WINS"
-
-#: ../param/loadparm.c:1043
-msgid "Locking Options"
-msgstr "Options de Verrouillage"
-
-#: ../param/loadparm.c:1061
-msgid "Ldap Options"
-msgstr "Options Ldap"
-
-#: ../param/loadparm.c:1078
-msgid "Miscellaneous Options"
-msgstr "Options Diverses"
-
-#: ../param/loadparm.c:1138
-msgid "VFS module options"
-msgstr "Options VFS"
-
-#: ../param/loadparm.c:1148
-msgid "Winbind options"
-msgstr "Options Winbind"
diff --git a/source3/po/genmsg b/source3/po/genmsg
deleted file mode 100755
index 9e9b53b3c8..0000000000
--- a/source3/po/genmsg
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2003 TAKAHASHI Motonobu <monyo@samba.org>
-# Copyright (C) 2009 Kai Blin <kai@samba.org>
-#
-# 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/>.
-#
-
-FILES='../web/swat.c ../web/statuspage.c ../param/loadparm.c'
-LANGS='en ja tr pl fr de it ru'
-
-XGETTEXT=xgettext
-MSGMERGE=msgmerge
-
-WIDTH=256
-
-$XGETTEXT --default-domain="i18n_swat" \
- --add-comments \
- --keyword=_ --keyword=N_ \
- --width=${WIDTH} \
- $FILES
-
-for lang in $LANGS; do
- printf "%s" "$lang"
- mv ${lang}.msg ${lang}.msg.old
- $MSGMERGE --width=${WIDTH} ${lang}.msg.old i18n_swat.po -o ${lang}.msg
-done
-
-rm i18n_swat.po
-
diff --git a/source3/po/it.msg b/source3/po/it.msg
deleted file mode 100644
index 90c3ed5672..0000000000
--- a/source3/po/it.msg
+++ /dev/null
@@ -1,592 +0,0 @@
-# Italian messages for international release of SWAT.
-# Copyright (C) 2001 Simo Sorce <idra@samba.org>
-#
-# 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: i18n_swat \n"
-"POT-Creation-Date: 2003-10-06 05:30+0900\n"
-"PO-Revision-Date: 2000-02-08 14:45+0100\n"
-"Last-Translator: Simo Sorce <idra@samba.org>\n"
-"Language-Team: (Samba Team) <samba-technical@samba.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: \n"
-
-#: ../web/swat.c:117
-#, c-format
-msgid "ERROR: Can't open %s"
-msgstr ""
-
-#: ../web/swat.c:200
-msgid "Help"
-msgstr "Aiuto"
-
-#: ../web/swat.c:206 ../web/swat.c:220 ../web/swat.c:235 ../web/swat.c:243 ../web/swat.c:252 ../web/swat.c:261 ../web/swat.c:267 ../web/swat.c:273 ../web/swat.c:286
-msgid "Set Default"
-msgstr "Imposta Default"
-
-#: ../web/swat.c:408
-#, c-format
-msgid "failed to open %s for writing"
-msgstr ""
-
-#: ../web/swat.c:431
-#, c-format
-msgid "Can't reload %s"
-msgstr ""
-
-#: ../web/swat.c:501
-#, c-format
-msgid "Logged in as <b>%s</b>"
-msgstr "Connesso come <b>%s</b><p>\n"
-
-#: ../web/swat.c:505
-msgid "Home"
-msgstr "Home"
-
-#: ../web/swat.c:507
-msgid "Globals"
-msgstr "Globali"
-
-#: ../web/swat.c:508
-msgid "Shares"
-msgstr "Condivisioni"
-
-#: ../web/swat.c:509
-msgid "Printers"
-msgstr "Stampanti"
-
-#: ../web/swat.c:510
-msgid "Wizard"
-msgstr ""
-
-#: ../web/swat.c:513
-msgid "Status"
-msgstr "Stato"
-
-#: ../web/swat.c:514
-msgid "View Config"
-msgstr "Visualizza Configurazione"
-
-#: ../web/swat.c:516
-msgid "Password Management"
-msgstr "Gestione Password"
-
-#: ../web/swat.c:526
-msgid "Current View Is"
-msgstr "Configurazione Attuale"
-
-#: ../web/swat.c:527 ../web/swat.c:530
-msgid "Basic"
-msgstr "Vista Semplice"
-
-#: ../web/swat.c:528 ../web/swat.c:531
-msgid "Advanced"
-msgstr "Vista Avanzata"
-
-#: ../web/swat.c:529
-msgid "Change View To"
-msgstr "Cambia Password"
-
-#: ../web/swat.c:554
-msgid "Current Config"
-msgstr "Configurazione Attuale"
-
-#: ../web/swat.c:558
-msgid "Normal View"
-msgstr "Vista Normale"
-
-#: ../web/swat.c:560
-msgid "Full View"
-msgstr "Vista Completa"
-
-#. Here we first set and commit all the parameters that were selected
-#. in the previous screen.
-#: ../web/swat.c:579
-msgid "Wizard Parameter Edit Page"
-msgstr ""
-
-#: ../web/swat.c:608
-msgid "Note: smb.conf file has been read and rewritten"
-msgstr ""
-
-#. Here we go ...
-#: ../web/swat.c:716
-msgid "Samba Configuration Wizard"
-msgstr ""
-
-#: ../web/swat.c:720
-msgid "The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."
-msgstr ""
-
-#: ../web/swat.c:721
-msgid "The same will happen if you press the commit button."
-msgstr ""
-
-#: ../web/swat.c:724
-msgid "Rewrite smb.conf file"
-msgstr ""
-
-#: ../web/swat.c:725
-msgid "Commit"
-msgstr "commento"
-
-#: ../web/swat.c:726
-msgid "Edit Parameter Values"
-msgstr "Parametri Stampante"
-
-#: ../web/swat.c:732
-msgid "Server Type"
-msgstr ""
-
-#: ../web/swat.c:733
-msgid "Stand Alone"
-msgstr ""
-
-#: ../web/swat.c:734
-msgid "Domain Member"
-msgstr "master dominio"
-
-#: ../web/swat.c:735
-msgid "Domain Controller"
-msgstr "master dominio"
-
-#: ../web/swat.c:738
-msgid "Unusual Type in smb.conf - Please Select New Mode"
-msgstr ""
-
-#: ../web/swat.c:740
-msgid "Configure WINS As"
-msgstr ""
-
-#: ../web/swat.c:741
-msgid "Not Used"
-msgstr "non discendere"
-
-#: ../web/swat.c:742
-msgid "Server for client use"
-msgstr ""
-
-#: ../web/swat.c:743
-msgid "Client of another WINS server"
-msgstr ""
-
-#: ../web/swat.c:745
-msgid "Remote WINS Server"
-msgstr ""
-
-#: ../web/swat.c:756
-msgid "Error: WINS Server Mode and WINS Support both set in smb.conf"
-msgstr ""
-
-#: ../web/swat.c:757
-msgid "Please Select desired WINS mode above."
-msgstr ""
-
-#: ../web/swat.c:759
-msgid "Expose Home Directories"
-msgstr ""
-
-#: ../web/swat.c:774
-msgid "The above configuration options will set multiple parameters and will generally assist with rapid Samba deployment."
-msgstr ""
-
-#: ../web/swat.c:787
-msgid "Global Parameters"
-msgstr "Variabili Globali"
-
-#: ../web/swat.c:815 ../web/swat.c:916 ../web/swat.c:1265
-msgid "Commit Changes"
-msgstr "Salva Modifiche"
-
-#: ../web/swat.c:819 ../web/swat.c:919 ../web/swat.c:1267
-msgid "Reset Values"
-msgstr "Resetta Valori"
-
-#: ../web/swat.c:844
-msgid "Share Parameters"
-msgstr "Parametri Condivisioni"
-
-#: ../web/swat.c:887
-msgid "Choose Share"
-msgstr "Scegli Condivisione"
-
-#: ../web/swat.c:901
-msgid "Delete Share"
-msgstr "Cancella Condivisione"
-
-#: ../web/swat.c:908
-msgid "Create Share"
-msgstr "Crea Condivisione"
-
-#: ../web/swat.c:944
-msgid "password change in demo mode rejected"
-msgstr "cambio password in modalita' demo rigettata"
-
-#: ../web/swat.c:957
-msgid "Can't setup password database vectors."
-msgstr ""
-
-#: ../web/swat.c:983
-msgid " Must specify \"User Name\" "
-msgstr " \"Nome Utente\" deve essere specificato "
-
-#: ../web/swat.c:999
-msgid " Must specify \"Old Password\" "
-msgstr " \"Vecchia Password\" deve essere specificato "
-
-#: ../web/swat.c:1005
-msgid " Must specify \"Remote Machine\" "
-msgstr " \"Macchina Remota\" deve essere specificato "
-
-#: ../web/swat.c:1012
-msgid " Must specify \"New, and Re-typed Passwords\" "
-msgstr " \"Nuova/Conferma Password\" devono essere specificati "
-
-#: ../web/swat.c:1018
-msgid " Re-typed password didn't match new password "
-msgstr " la password di conferma non e' uguale alla nuova password "
-
-#: ../web/swat.c:1048
-#, c-format
-msgid " The passwd for '%s' has been changed."
-msgstr " La password per '%s' e' stata cambiata."
-
-#: ../web/swat.c:1051
-#, c-format
-msgid " The passwd for '%s' has NOT been changed."
-msgstr " La password per '%s' non e' stata cambianta."
-
-#: ../web/swat.c:1076
-msgid "Server Password Management"
-msgstr "Gestione Password del Server"
-
-#.
-#. * Create all the dialog boxes for data collection
-#.
-#: ../web/swat.c:1085 ../web/swat.c:1132
-msgid "User Name"
-msgstr " Nome Utente"
-
-#: ../web/swat.c:1088 ../web/swat.c:1134
-msgid "Old Password"
-msgstr " Vecchia Password"
-
-#: ../web/swat.c:1091 ../web/swat.c:1136
-msgid "New Password"
-msgstr " Nuova Password"
-
-#: ../web/swat.c:1093 ../web/swat.c:1138
-msgid "Re-type New Password"
-msgstr " Conferma nuova Password"
-
-#: ../web/swat.c:1101 ../web/swat.c:1149
-msgid "Change Password"
-msgstr "Cambia Password"
-
-#: ../web/swat.c:1104
-msgid "Add New User"
-msgstr "Aggiungi Nuovo Utente"
-
-#: ../web/swat.c:1106
-msgid "Delete User"
-msgstr "Cancella Utente"
-
-#: ../web/swat.c:1108
-msgid "Disable User"
-msgstr "Disabilita Utente"
-
-#: ../web/swat.c:1110
-msgid "Enable User"
-msgstr "Abilita Utente"
-
-#: ../web/swat.c:1123
-msgid "Client/Server Password Management"
-msgstr "Gestione Password Client/Server"
-
-#: ../web/swat.c:1140
-msgid "Remote Machine"
-msgstr " Macchina Remota"
-
-#: ../web/swat.c:1179
-msgid "Printer Parameters"
-msgstr "Parametri Stampante"
-
-#: ../web/swat.c:1181
-msgid "Important Note:"
-msgstr "Nota Importante:"
-
-#: ../web/swat.c:1182
-msgid "Printer names marked with [*] in the Choose Printer drop-down box "
-msgstr "nomi di stampante marcati con [*] nel riquadro a scomparsa Scegli Stampante"
-
-#: ../web/swat.c:1183
-msgid "are autoloaded printers from "
-msgstr "sono stampanti caricate automaticamente da "
-
-#: ../web/swat.c:1184
-msgid "Printcap Name"
-msgstr "Nome Printcap"
-
-#: ../web/swat.c:1185
-msgid "Attempting to delete these printers from SWAT will have no effect."
-msgstr "Il tentativo di cancellare queste stampanti da sWAT non avara' effetto.\n"
-
-#: ../web/swat.c:1231
-msgid "Choose Printer"
-msgstr "Scegli Stampante"
-
-#: ../web/swat.c:1250
-msgid "Delete Printer"
-msgstr "Cancella Stampante"
-
-#: ../web/swat.c:1257
-msgid "Create Printer"
-msgstr "Crea Stampante"
-
-#: ../web/statuspage.c:123
-msgid "RDONLY "
-msgstr ""
-
-#: ../web/statuspage.c:124
-msgid "WRONLY "
-msgstr ""
-
-#: ../web/statuspage.c:125
-msgid "RDWR "
-msgstr ""
-
-#: ../web/statuspage.c:309
-msgid "Server Status"
-msgstr "Stato del Server"
-
-#: ../web/statuspage.c:314
-msgid "Auto Refresh"
-msgstr "Rinfresco Automatico"
-
-#: ../web/statuspage.c:315 ../web/statuspage.c:320
-msgid "Refresh Interval: "
-msgstr "Intervallo Rinfresco: "
-
-#: ../web/statuspage.c:319
-msgid "Stop Refreshing"
-msgstr "Ferma Rinfresco"
-
-#: ../web/statuspage.c:334
-msgid "version:"
-msgstr "versione:"
-
-#: ../web/statuspage.c:337
-msgid "smbd:"
-msgstr ""
-
-#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
-msgid "running"
-msgstr "attivo"
-
-#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
-msgid "not running"
-msgstr "non attivo"
-
-#: ../web/statuspage.c:341
-msgid "Stop smbd"
-msgstr "Ferma smbd"
-
-#: ../web/statuspage.c:343
-msgid "Start smbd"
-msgstr "Lancia smbd"
-
-#: ../web/statuspage.c:345
-msgid "Restart smbd"
-msgstr "Rilancia smbd"
-
-#: ../web/statuspage.c:350
-msgid "nmbd:"
-msgstr ""
-
-#: ../web/statuspage.c:354
-msgid "Stop nmbd"
-msgstr "Ferma nmbd"
-
-#: ../web/statuspage.c:356
-msgid "Start nmbd"
-msgstr "Lancia nmbd"
-
-#: ../web/statuspage.c:358
-msgid "Restart nmbd"
-msgstr "Rilancia nmbd"
-
-#: ../web/statuspage.c:364
-msgid "winbindd:"
-msgstr ""
-
-#: ../web/statuspage.c:368
-msgid "Stop winbindd"
-msgstr "Ferma nmbd"
-
-#: ../web/statuspage.c:370
-msgid "Start winbindd"
-msgstr "Lancia nmbd"
-
-#: ../web/statuspage.c:372
-msgid "Restart winbindd"
-msgstr "Rilancia nmbd"
-
-#. stop, restart all
-#: ../web/statuspage.c:381
-msgid "Stop All"
-msgstr ""
-
-#: ../web/statuspage.c:382
-msgid "Restart All"
-msgstr "Rilancia nmbd"
-
-#. start all
-#: ../web/statuspage.c:386
-msgid "Start All"
-msgstr "Lancia nmbd"
-
-#: ../web/statuspage.c:393
-msgid "Active Connections"
-msgstr "Connessioni Attive"
-
-#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
-msgid "PID"
-msgstr ""
-
-#: ../web/statuspage.c:395 ../web/statuspage.c:408
-msgid "Client"
-msgstr ""
-
-#: ../web/statuspage.c:395
-msgid "IP address"
-msgstr "indirizzo IP"
-
-#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
-msgid "Date"
-msgstr "Data"
-
-#: ../web/statuspage.c:397
-msgid "Kill"
-msgstr "Termina"
-
-#: ../web/statuspage.c:405
-msgid "Active Shares"
-msgstr "Condivisioni Attive"
-
-#: ../web/statuspage.c:408
-msgid "Share"
-msgstr "Condivisione"
-
-#: ../web/statuspage.c:408
-msgid "User"
-msgstr "Utente"
-
-#: ../web/statuspage.c:408
-msgid "Group"
-msgstr "Gruppo"
-
-#: ../web/statuspage.c:414
-msgid "Open Files"
-msgstr "File Aperti"
-
-#: ../web/statuspage.c:416
-msgid "Sharing"
-msgstr ""
-
-#: ../web/statuspage.c:416
-msgid "R/W"
-msgstr ""
-
-#: ../web/statuspage.c:416
-msgid "Oplock"
-msgstr ""
-
-#: ../web/statuspage.c:416
-msgid "File"
-msgstr ""
-
-#: ../web/statuspage.c:425
-msgid "Show Client in col 1"
-msgstr ""
-
-#: ../web/statuspage.c:426
-msgid "Show PID in col 1"
-msgstr ""
-
-#: ../param/loadparm.c:755
-msgid "Base Options"
-msgstr "Opzioni Basilari"
-
-#: ../param/loadparm.c:775
-msgid "Security Options"
-msgstr "Opzioni di Sicurezza"
-
-#: ../param/loadparm.c:859
-msgid "Logging Options"
-msgstr "Opzioni di Log"
-
-#: ../param/loadparm.c:874
-msgid "Protocol Options"
-msgstr "Opzioni Protocollo"
-
-#: ../param/loadparm.c:911
-msgid "Tuning Options"
-msgstr "Opzioni Tuning"
-
-#: ../param/loadparm.c:940
-msgid "Printing Options"
-msgstr "Opzioni di Stampa"
-
-#: ../param/loadparm.c:970
-msgid "Filename Handling"
-msgstr "Gestione Nomi File"
-
-#: ../param/loadparm.c:996
-msgid "Domain Options"
-msgstr "Opzioni Dominio"
-
-#: ../param/loadparm.c:1000
-msgid "Logon Options"
-msgstr "Opzioni di Logon"
-
-#: ../param/loadparm.c:1019
-msgid "Browse Options"
-msgstr "Opzioni Browsing"
-
-#: ../param/loadparm.c:1033
-msgid "WINS Options"
-msgstr "opzioni WINS"
-
-#: ../param/loadparm.c:1043
-msgid "Locking Options"
-msgstr "Opzioni Locking"
-
-#: ../param/loadparm.c:1061
-msgid "Ldap Options"
-msgstr "Opzioni Ldap"
-
-#: ../param/loadparm.c:1078
-msgid "Miscellaneous Options"
-msgstr "Opzioni Generiche"
-
-#: ../param/loadparm.c:1138
-msgid "VFS module options"
-msgstr "Opzioni VFS"
-
-#: ../param/loadparm.c:1148
-msgid "Winbind options"
-msgstr "Opzioni Winbind"
diff --git a/source3/po/ja.msg b/source3/po/ja.msg
deleted file mode 100644
index 52ec57105f..0000000000
--- a/source3/po/ja.msg
+++ /dev/null
@@ -1,594 +0,0 @@
-# Japanese messages for international release of SWAT.
-# Copyright (C) 2003 TAKAHASHI Motonobu <monyo@samba.org>
-# Copyright (C) 2000 Ryo Kawahara <rkawa@lbe.co.jp>
-#
-# 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: i18n-swat\n"
-"POT-Creation-Date: 2003-10-06 05:30+0900\n"
-"PO-Revision-Date: 2003-09-23 04:38+900\n"
-"Last-Translator: TAKAHASHI Motonobu <monyo@samba.org>\n"
-"Language-Team: Samba Users Group Japan <sugj-tech@samba.gr.jp>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../web/swat.c:117
-#, c-format
-msgid "ERROR: Can't open %s"
-msgstr "%s をオープンできません"
-
-#: ../web/swat.c:200
-msgid "Help"
-msgstr "ヘルプ"
-
-#: ../web/swat.c:206 ../web/swat.c:220 ../web/swat.c:235 ../web/swat.c:243 ../web/swat.c:252 ../web/swat.c:261 ../web/swat.c:267 ../web/swat.c:273 ../web/swat.c:286
-msgid "Set Default"
-msgstr "デフォルト値"
-
-#: ../web/swat.c:408
-#, c-format
-msgid "failed to open %s for writing"
-msgstr "%s を書き込み用にオープンできません"
-
-#: ../web/swat.c:431
-#, c-format
-msgid "Can't reload %s"
-msgstr "%s を再読み込みできません\n"
-
-# msgid "Logged in as <b>%s</b><p>\n"
-#: ../web/swat.c:501
-#, c-format
-msgid "Logged in as <b>%s</b>"
-msgstr "<b>%s</b>としてログイン"
-
-#: ../web/swat.c:505
-msgid "Home"
-msgstr "ホーム"
-
-#: ../web/swat.c:507
-msgid "Globals"
-msgstr "グローバル"
-
-#: ../web/swat.c:508
-msgid "Shares"
-msgstr "ファイル共有"
-
-#: ../web/swat.c:509
-msgid "Printers"
-msgstr "印刷共有"
-
-#: ../web/swat.c:510
-msgid "Wizard"
-msgstr "ウィザード"
-
-#: ../web/swat.c:513
-msgid "Status"
-msgstr "サーバの状態"
-
-#: ../web/swat.c:514
-msgid "View Config"
-msgstr "現在の設定"
-
-#: ../web/swat.c:516
-msgid "Password Management"
-msgstr "パスワード管理"
-
-#: ../web/swat.c:526
-msgid "Current View Is"
-msgstr "現在の表示モード"
-
-#: ../web/swat.c:527 ../web/swat.c:530
-msgid "Basic"
-msgstr "標準表示"
-
-#: ../web/swat.c:528 ../web/swat.c:531
-msgid "Advanced"
-msgstr "詳細表示"
-
-#: ../web/swat.c:529
-msgid "Change View To"
-msgstr "表示モードの変更"
-
-#: ../web/swat.c:554
-msgid "Current Config"
-msgstr "現在の設定"
-
-#: ../web/swat.c:558
-msgid "Normal View"
-msgstr "標準表示"
-
-#: ../web/swat.c:560
-msgid "Full View"
-msgstr "完全表示"
-
-#. Here we first set and commit all the parameters that were selected
-#. in the previous screen.
-#: ../web/swat.c:579
-msgid "Wizard Parameter Edit Page"
-msgstr "ウィザードによるパラメータ編集ページ"
-
-#: ../web/swat.c:608
-msgid "Note: smb.conf file has been read and rewritten"
-msgstr "smb.conf ファイルが書き換えられました。"
-
-#. Here we go ...
-#: ../web/swat.c:716
-msgid "Samba Configuration Wizard"
-msgstr "Samba 設定ウィザード"
-
-#: ../web/swat.c:720
-msgid "The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."
-msgstr "「smb.conf の書換」ボタンを押すと smb.conf ファイル中のすべてのデフォルト値やコメントは削除されます。"
-
-#: ../web/swat.c:721
-msgid "The same will happen if you press the commit button."
-msgstr "「commit」ボタンを押した場合にも同様の変更が行なわれます。"
-
-#: ../web/swat.c:724
-msgid "Rewrite smb.conf file"
-msgstr "smb.conf の書換"
-
-#: ../web/swat.c:725
-msgid "Commit"
-msgstr "設定を反映"
-
-#: ../web/swat.c:726
-msgid "Edit Parameter Values"
-msgstr "各パラメータの編集"
-
-#: ../web/swat.c:732
-msgid "Server Type"
-msgstr "サーバタイプ"
-
-#: ../web/swat.c:733
-msgid "Stand Alone"
-msgstr "スタンドアロン"
-
-#: ../web/swat.c:734
-msgid "Domain Member"
-msgstr "ドメインメンバ"
-
-#: ../web/swat.c:735
-msgid "Domain Controller"
-msgstr "ドメインコントローラ"
-
-#: ../web/swat.c:738
-msgid "Unusual Type in smb.conf - Please Select New Mode"
-msgstr "通常の形式ではない - 新しいモードを選択のこと"
-
-#: ../web/swat.c:740
-msgid "Configure WINS As"
-msgstr "WINS"
-
-#: ../web/swat.c:741
-msgid "Not Used"
-msgstr "使わない"
-
-#: ../web/swat.c:742
-msgid "Server for client use"
-msgstr "サーバとして構成"
-
-#: ../web/swat.c:743
-msgid "Client of another WINS server"
-msgstr "別の WINS サーバのクライアントとして構成"
-
-#: ../web/swat.c:745
-msgid "Remote WINS Server"
-msgstr "別の WINS サーバ"
-
-#: ../web/swat.c:756
-msgid "Error: WINS Server Mode and WINS Support both set in smb.conf"
-msgstr "エラー: wins server と wins support の両パラメータが smb.conf で指定されています"
-
-#: ../web/swat.c:757
-msgid "Please Select desired WINS mode above."
-msgstr "いずれかの WINS モードを選択してください。"
-
-#: ../web/swat.c:759
-msgid "Expose Home Directories"
-msgstr "ホームディレクトリの公開"
-
-#: ../web/swat.c:774
-msgid "The above configuration options will set multiple parameters and will generally assist with rapid Samba deployment."
-msgstr "上記の設定オプションにより、複数のパラメータが同期して設定されるため、 Samba の運用を迅速に開始する上での助けとなるでしょう。"
-
-#: ../web/swat.c:787
-msgid "Global Parameters"
-msgstr "Global パラメータ"
-
-#: ../web/swat.c:815 ../web/swat.c:916 ../web/swat.c:1265
-msgid "Commit Changes"
-msgstr "変更を反映"
-
-#: ../web/swat.c:819 ../web/swat.c:919 ../web/swat.c:1267
-msgid "Reset Values"
-msgstr "変更を取消"
-
-#: ../web/swat.c:844
-msgid "Share Parameters"
-msgstr "ファイル共有 パラメータ"
-
-#: ../web/swat.c:887
-msgid "Choose Share"
-msgstr "ファイル共有の選択"
-
-#: ../web/swat.c:901
-msgid "Delete Share"
-msgstr "ファイル共有の削除"
-
-#: ../web/swat.c:908
-msgid "Create Share"
-msgstr "ファイル共有の作成"
-
-#: ../web/swat.c:944
-msgid "password change in demo mode rejected"
-msgstr "デモ・モードでのパスワード変更はできません"
-
-#: ../web/swat.c:957
-msgid "Can't setup password database vectors."
-msgstr "パスワード・データベースが見つけられません"
-
-#: ../web/swat.c:983
-msgid " Must specify \"User Name\" "
-msgstr "「ユーザ名」欄に入力してください"
-
-#: ../web/swat.c:999
-msgid " Must specify \"Old Password\" "
-msgstr "「旧パスワード」欄に入力してください"
-
-#: ../web/swat.c:1005
-msgid " Must specify \"Remote Machine\" "
-msgstr "「リモートマシン」欄に入力してください"
-
-#: ../web/swat.c:1012
-msgid " Must specify \"New, and Re-typed Passwords\" "
-msgstr "「新パスワード」欄と「新パスワードの再入力」欄に入力してください"
-
-#: ../web/swat.c:1018
-msgid " Re-typed password didn't match new password "
-msgstr "「新パスワードの再入力」欄の入力内容が「新パスワード」欄の入力と一致していません。"
-
-#: ../web/swat.c:1048
-#, c-format
-msgid " The passwd for '%s' has been changed."
-msgstr " %s のパスワードは変更されました。"
-
-#: ../web/swat.c:1051
-#, c-format
-msgid " The passwd for '%s' has NOT been changed."
-msgstr " '%s' のパスワードは変更されませんでした。"
-
-#: ../web/swat.c:1076
-msgid "Server Password Management"
-msgstr "ローカルマシンのパスワード管理"
-
-#.
-#. * Create all the dialog boxes for data collection
-#.
-#: ../web/swat.c:1085 ../web/swat.c:1132
-msgid "User Name"
-msgstr "ユーザ名"
-
-#: ../web/swat.c:1088 ../web/swat.c:1134
-msgid "Old Password"
-msgstr "旧パスワード"
-
-#: ../web/swat.c:1091 ../web/swat.c:1136
-msgid "New Password"
-msgstr "新パスワード"
-
-#: ../web/swat.c:1093 ../web/swat.c:1138
-msgid "Re-type New Password"
-msgstr "新パスワードの再入力"
-
-#: ../web/swat.c:1101 ../web/swat.c:1149
-msgid "Change Password"
-msgstr "パスワード変更"
-
-#: ../web/swat.c:1104
-msgid "Add New User"
-msgstr "新規ユーザ追加"
-
-#: ../web/swat.c:1106
-msgid "Delete User"
-msgstr "ユーザの削除"
-
-#: ../web/swat.c:1108
-msgid "Disable User"
-msgstr "ユーザの無効化"
-
-#: ../web/swat.c:1110
-msgid "Enable User"
-msgstr "ユーザの有効化"
-
-#: ../web/swat.c:1123
-msgid "Client/Server Password Management"
-msgstr "リモートマシンのパスワード管理"
-
-#: ../web/swat.c:1140
-msgid "Remote Machine"
-msgstr "リモートマシン"
-
-#: ../web/swat.c:1179
-msgid "Printer Parameters"
-msgstr "印刷共有 パラメータ"
-
-#: ../web/swat.c:1181
-msgid "Important Note:"
-msgstr "*注"
-
-#: ../web/swat.c:1182
-msgid "Printer names marked with [*] in the Choose Printer drop-down box "
-msgstr "名前の先頭に [*] がついたプリンタ"
-
-#: ../web/swat.c:1183
-msgid "are autoloaded printers from "
-msgstr "は"
-
-#: ../web/swat.c:1184
-msgid "Printcap Name"
-msgstr "printcap name パラメータ"
-
-#: ../web/swat.c:1185
-msgid "Attempting to delete these printers from SWAT will have no effect."
-msgstr "から自動設定されたものですから、削除することはできません。"
-
-#: ../web/swat.c:1231
-msgid "Choose Printer"
-msgstr "印刷共有の選択"
-
-#: ../web/swat.c:1250
-msgid "Delete Printer"
-msgstr "印刷共有の削除"
-
-#: ../web/swat.c:1257
-msgid "Create Printer"
-msgstr "印刷共有の作成"
-
-#: ../web/statuspage.c:123
-msgid "RDONLY "
-msgstr "参照のみ "
-
-#: ../web/statuspage.c:124
-msgid "WRONLY "
-msgstr "更新のみ "
-
-#: ../web/statuspage.c:125
-msgid "RDWR "
-msgstr "参照/更新 "
-
-#: ../web/statuspage.c:309
-msgid "Server Status"
-msgstr "サーバの状態"
-
-#: ../web/statuspage.c:314
-msgid "Auto Refresh"
-msgstr "自動更新の開始"
-
-#: ../web/statuspage.c:315 ../web/statuspage.c:320
-msgid "Refresh Interval: "
-msgstr "更新間隔: "
-
-#: ../web/statuspage.c:319
-msgid "Stop Refreshing"
-msgstr "自動更新の停止"
-
-#: ../web/statuspage.c:334
-msgid "version:"
-msgstr "バージョン"
-
-#: ../web/statuspage.c:337
-msgid "smbd:"
-msgstr ""
-
-#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
-msgid "running"
-msgstr "実行中"
-
-#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
-msgid "not running"
-msgstr "停止中"
-
-#: ../web/statuspage.c:341
-msgid "Stop smbd"
-msgstr "smbd の停止"
-
-#: ../web/statuspage.c:343
-msgid "Start smbd"
-msgstr "smbd の起動"
-
-#: ../web/statuspage.c:345
-msgid "Restart smbd"
-msgstr "smbd の再起動"
-
-#: ../web/statuspage.c:350
-msgid "nmbd:"
-msgstr ""
-
-#: ../web/statuspage.c:354
-msgid "Stop nmbd"
-msgstr "nmbd の停止"
-
-#: ../web/statuspage.c:356
-msgid "Start nmbd"
-msgstr "nmbd の起動"
-
-#: ../web/statuspage.c:358
-msgid "Restart nmbd"
-msgstr "nmbd の再起動"
-
-#: ../web/statuspage.c:364
-msgid "winbindd:"
-msgstr ""
-
-#: ../web/statuspage.c:368
-msgid "Stop winbindd"
-msgstr "winbindd の停止"
-
-#: ../web/statuspage.c:370
-msgid "Start winbindd"
-msgstr "winbindd の起動"
-
-#: ../web/statuspage.c:372
-msgid "Restart winbindd"
-msgstr "winbindd の再起動"
-
-#. stop, restart all
-#: ../web/statuspage.c:381
-msgid "Stop All"
-msgstr "すべて停止"
-
-#: ../web/statuspage.c:382
-msgid "Restart All"
-msgstr "すべて再起動"
-
-#. start all
-#: ../web/statuspage.c:386
-msgid "Start All"
-msgstr "すべて起動"
-
-#: ../web/statuspage.c:393
-msgid "Active Connections"
-msgstr "接続中のクライアント"
-
-#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
-msgid "PID"
-msgstr ""
-
-#: ../web/statuspage.c:395 ../web/statuspage.c:408
-msgid "Client"
-msgstr "クライアント"
-
-#: ../web/statuspage.c:395
-msgid "IP address"
-msgstr "IPアドレス"
-
-#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
-msgid "Date"
-msgstr "日付"
-
-#: ../web/statuspage.c:397
-msgid "Kill"
-msgstr "切断"
-
-#: ../web/statuspage.c:405
-msgid "Active Shares"
-msgstr "接続中の共有"
-
-#: ../web/statuspage.c:408
-msgid "Share"
-msgstr "共有名"
-
-#: ../web/statuspage.c:408
-msgid "User"
-msgstr "ユーザ"
-
-#: ../web/statuspage.c:408
-msgid "Group"
-msgstr "グループ"
-
-#: ../web/statuspage.c:414
-msgid "Open Files"
-msgstr "使用中のファイル"
-
-#: ../web/statuspage.c:416
-msgid "Sharing"
-msgstr "排他モード"
-
-#: ../web/statuspage.c:416
-msgid "R/W"
-msgstr "参照/更新"
-
-#: ../web/statuspage.c:416
-msgid "Oplock"
-msgstr ""
-
-#: ../web/statuspage.c:416
-msgid "File"
-msgstr "ファイル名"
-
-#: ../web/statuspage.c:425
-msgid "Show Client in col 1"
-msgstr "クライアント名を先頭に表示"
-
-#: ../web/statuspage.c:426
-msgid "Show PID in col 1"
-msgstr "PIDを先頭に表示"
-
-#: ../param/loadparm.c:755
-msgid "Base Options"
-msgstr "基本 オプション"
-
-#: ../param/loadparm.c:775
-msgid "Security Options"
-msgstr "セキュリティ オプション"
-
-#: ../param/loadparm.c:859
-msgid "Logging Options"
-msgstr "ロギング オプション"
-
-#: ../param/loadparm.c:874
-msgid "Protocol Options"
-msgstr "プロトコル オプション"
-
-#: ../param/loadparm.c:911
-msgid "Tuning Options"
-msgstr "チューニング オプション"
-
-#: ../param/loadparm.c:940
-msgid "Printing Options"
-msgstr "印刷 オプション"
-
-#: ../param/loadparm.c:970
-msgid "Filename Handling"
-msgstr "ファイル名の取扱"
-
-#: ../param/loadparm.c:996
-msgid "Domain Options"
-msgstr "ドメイン オプション"
-
-#: ../param/loadparm.c:1000
-msgid "Logon Options"
-msgstr "ログオン オプション"
-
-#: ../param/loadparm.c:1019
-msgid "Browse Options"
-msgstr "ブラウジング オプション"
-
-#: ../param/loadparm.c:1033
-msgid "WINS Options"
-msgstr "WINS オプション"
-
-#: ../param/loadparm.c:1043
-msgid "Locking Options"
-msgstr "ロッキング オプション"
-
-#: ../param/loadparm.c:1061
-msgid "Ldap Options"
-msgstr "LDAP オプション"
-
-#: ../param/loadparm.c:1078
-msgid "Miscellaneous Options"
-msgstr "その他のオプション"
-
-#: ../param/loadparm.c:1138
-msgid "VFS module options"
-msgstr "VFS オプション"
-
-#: ../param/loadparm.c:1148
-msgid "Winbind options"
-msgstr "Winbind オプション"
diff --git a/source3/po/nl.msg b/source3/po/nl.msg
deleted file mode 100644
index c0aae12617..0000000000
--- a/source3/po/nl.msg
+++ /dev/null
@@ -1,592 +0,0 @@
-# Dutch messages for international release of SWAT.
-# Copyright (C) 2003 Jelmer Vernooij <jelmer@samba.org>
-#
-# 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: i18n_swat \n"
-"POT-Creation-Date: 2003-10-06 05:30+0900\n"
-"PO-Revision-Date: 2000-02-08 12:48+09:00\n"
-"Last-Translator: Jelmer Vernooij <jelmer@samba.org>\n"
-"Language-Team: (Samba Team) <samba-technical@samba.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-
-#: ../web/swat.c:117
-#, c-format
-msgid "ERROR: Can't open %s"
-msgstr "FOUT: Kan %s niet openen"
-
-#: ../web/swat.c:200
-msgid "Help"
-msgstr "Help"
-
-#: ../web/swat.c:206 ../web/swat.c:220 ../web/swat.c:235 ../web/swat.c:243 ../web/swat.c:252 ../web/swat.c:261 ../web/swat.c:267 ../web/swat.c:273 ../web/swat.c:286
-msgid "Set Default"
-msgstr "Stel Standaard In"
-
-#: ../web/swat.c:408
-#, c-format
-msgid "failed to open %s for writing"
-msgstr "kon %s niet openen voor schrijven"
-
-#: ../web/swat.c:431
-#, c-format
-msgid "Can't reload %s"
-msgstr "Kan %s niet herladen"
-
-#: ../web/swat.c:501
-#, c-format
-msgid "Logged in as <b>%s</b>"
-msgstr "Ingelogd als <b>%s</b>"
-
-#: ../web/swat.c:505
-msgid "Home"
-msgstr "Home"
-
-#: ../web/swat.c:507
-msgid "Globals"
-msgstr "Algemene Instellingen"
-
-#: ../web/swat.c:508
-msgid "Shares"
-msgstr "Gedeelde Bronnen"
-
-#: ../web/swat.c:509
-msgid "Printers"
-msgstr "Printers"
-
-#: ../web/swat.c:510
-msgid "Wizard"
-msgstr "Wizard"
-
-#: ../web/swat.c:513
-msgid "Status"
-msgstr "Status"
-
-#: ../web/swat.c:514
-msgid "View Config"
-msgstr "Bekijk Configuratie"
-
-#: ../web/swat.c:516
-msgid "Password Management"
-msgstr "Wachtwoord Beheer"
-
-#: ../web/swat.c:526
-msgid "Current View Is"
-msgstr "Huidige weergave is"
-
-#: ../web/swat.c:527 ../web/swat.c:530
-msgid "Basic"
-msgstr "Basis"
-
-#: ../web/swat.c:528 ../web/swat.c:531
-msgid "Advanced"
-msgstr "Geadvanceerd"
-
-#: ../web/swat.c:529
-msgid "Change View To"
-msgstr "Verander Weergave In"
-
-#: ../web/swat.c:554
-msgid "Current Config"
-msgstr "Huidige Configuratie"
-
-#: ../web/swat.c:558
-msgid "Normal View"
-msgstr "Normale Weergave"
-
-#: ../web/swat.c:560
-msgid "Full View"
-msgstr "Volledige Weergave"
-
-#. Here we first set and commit all the parameters that were selected
-#. in the previous screen.
-#: ../web/swat.c:579
-msgid "Wizard Parameter Edit Page"
-msgstr "Wizard Instellingen Veranderen Pagina"
-
-#: ../web/swat.c:608
-msgid "Note: smb.conf file has been read and rewritten"
-msgstr "N.B.: het smb.conf bestand is gelezen en herschreven"
-
-#. Here we go ...
-#: ../web/swat.c:716
-msgid "Samba Configuration Wizard"
-msgstr "Samba Configuratie Wizard"
-
-#: ../web/swat.c:720
-msgid "The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."
-msgstr "De \"Herschrijf smb.conf bestand\" knop zal alle standaardwaardes en alle commentaar verwijderen."
-
-#: ../web/swat.c:721
-msgid "The same will happen if you press the commit button."
-msgstr "Hetzelfde zal gebeuren als u de \"toepassen\" knop gebruikt."
-
-#: ../web/swat.c:724
-msgid "Rewrite smb.conf file"
-msgstr "Herschrijf smb.conf bestand"
-
-#: ../web/swat.c:725
-msgid "Commit"
-msgstr "Toepassen"
-
-#: ../web/swat.c:726
-msgid "Edit Parameter Values"
-msgstr "Bewerk Configuratie Waardes"
-
-#: ../web/swat.c:732
-msgid "Server Type"
-msgstr "Server Type"
-
-#: ../web/swat.c:733
-msgid "Stand Alone"
-msgstr "Stand Alone"
-
-#: ../web/swat.c:734
-msgid "Domain Member"
-msgstr "Domein Lid"
-
-#: ../web/swat.c:735
-msgid "Domain Controller"
-msgstr "Domein Controller"
-
-#: ../web/swat.c:738
-msgid "Unusual Type in smb.conf - Please Select New Mode"
-msgstr "Ongebruikelijk Type in smb.conf - Selecteer een nieuwe modus"
-
-#: ../web/swat.c:740
-msgid "Configure WINS As"
-msgstr "Configureer WINS Als"
-
-#: ../web/swat.c:741
-msgid "Not Used"
-msgstr "Niet gebruikt"
-
-#: ../web/swat.c:742
-msgid "Server for client use"
-msgstr "Server voor client gebruik"
-
-#: ../web/swat.c:743
-msgid "Client of another WINS server"
-msgstr "Client van een andere WINS server"
-
-#: ../web/swat.c:745
-msgid "Remote WINS Server"
-msgstr "Naam of IP-adres WINS Server"
-
-#: ../web/swat.c:756
-msgid "Error: WINS Server Mode and WINS Support both set in smb.conf"
-msgstr "Fout: WINS Server Modus en WINS Ondersteuning beiden ingesteld in smb.conf"
-
-#: ../web/swat.c:757
-msgid "Please Select desired WINS mode above."
-msgstr "Selecteer hierboven de gewenste WINS modus."
-
-#: ../web/swat.c:759
-msgid "Expose Home Directories"
-msgstr "Stel Home Directories Open"
-
-#: ../web/swat.c:774
-msgid "The above configuration options will set multiple parameters and will generally assist with rapid Samba deployment."
-msgstr "The configuratie hierboven zal meerdere variabelen veranderen en zal over het algemeen zorgen voor snelle installatie van Samba."
-
-#: ../web/swat.c:787
-msgid "Global Parameters"
-msgstr "Algemene Instellingen"
-
-#: ../web/swat.c:815 ../web/swat.c:916 ../web/swat.c:1265
-msgid "Commit Changes"
-msgstr "Pas Veranderingen Toe"
-
-#: ../web/swat.c:819 ../web/swat.c:919 ../web/swat.c:1267
-msgid "Reset Values"
-msgstr "Beginwaarden"
-
-#: ../web/swat.c:844
-msgid "Share Parameters"
-msgstr "Instellingen Gedeelde Bronnen"
-
-#: ../web/swat.c:887
-msgid "Choose Share"
-msgstr "Kies Bron"
-
-#: ../web/swat.c:901
-msgid "Delete Share"
-msgstr "Verwijder Bron"
-
-#: ../web/swat.c:908
-msgid "Create Share"
-msgstr "Maak Bron"
-
-#: ../web/swat.c:944
-msgid "password change in demo mode rejected"
-msgstr "wachtwoord veranderen in demo modus geweigerd"
-
-#: ../web/swat.c:957
-msgid "Can't setup password database vectors."
-msgstr "Kan wachtwoord database vectors niet opzetten."
-
-#: ../web/swat.c:983
-msgid " Must specify \"User Name\" "
-msgstr " \"Gebruikersnaam\" moet opgegeven worden "
-
-#: ../web/swat.c:999
-msgid " Must specify \"Old Password\" "
-msgstr " \"Oude wachtwoord\" moet opgegeven worden "
-
-#: ../web/swat.c:1005
-msgid " Must specify \"Remote Machine\" "
-msgstr " \"Server Naam of IP\" moet opgegeven worden "
-
-#: ../web/swat.c:1012
-msgid " Must specify \"New, and Re-typed Passwords\" "
-msgstr " \"Nieuw, en bevestiging Wachtwoorden\" moeten opgegeven worden "
-
-#: ../web/swat.c:1018
-msgid " Re-typed password didn't match new password "
-msgstr " Bevestigingswachtwoord was anders dan nieuwe wachtwoord "
-
-#: ../web/swat.c:1048
-#, c-format
-msgid " The passwd for '%s' has been changed."
-msgstr " Het wachtwoord voor '%s' is veranderd."
-
-#: ../web/swat.c:1051
-#, c-format
-msgid " The passwd for '%s' has NOT been changed."
-msgstr " Het wachtwoord voor '%s' is niet veranderd."
-
-#: ../web/swat.c:1076
-msgid "Server Password Management"
-msgstr "Server Wachtwoord Beheer"
-
-#.
-#. * Create all the dialog boxes for data collection
-#.
-#: ../web/swat.c:1085 ../web/swat.c:1132
-msgid "User Name"
-msgstr "Gebuikersnaam"
-
-#: ../web/swat.c:1088 ../web/swat.c:1134
-msgid "Old Password"
-msgstr "Oud Wachtwoord"
-
-#: ../web/swat.c:1091 ../web/swat.c:1136
-msgid "New Password"
-msgstr "Nieuw Wachtwoord"
-
-#: ../web/swat.c:1093 ../web/swat.c:1138
-msgid "Re-type New Password"
-msgstr "Bevestiging Nieuw Wachtwoord"
-
-#: ../web/swat.c:1101 ../web/swat.c:1149
-msgid "Change Password"
-msgstr "Verander Wachtwoord"
-
-#: ../web/swat.c:1104
-msgid "Add New User"
-msgstr "Voeg Gebruiker Toe"
-
-#: ../web/swat.c:1106
-msgid "Delete User"
-msgstr "Verwijder Gebruiker"
-
-#: ../web/swat.c:1108
-msgid "Disable User"
-msgstr "Maak gebruiker inactief"
-
-#: ../web/swat.c:1110
-msgid "Enable User"
-msgstr "Maak gebruiker actief"
-
-#: ../web/swat.c:1123
-msgid "Client/Server Password Management"
-msgstr "Client/Server Wachtwoord Beheer"
-
-#: ../web/swat.c:1140
-msgid "Remote Machine"
-msgstr "Naam of IP Server"
-
-#: ../web/swat.c:1179
-msgid "Printer Parameters"
-msgstr "Printer Instellingen"
-
-#: ../web/swat.c:1181
-msgid "Important Note:"
-msgstr "Belangrijk:"
-
-#: ../web/swat.c:1182
-msgid "Printer names marked with [*] in the Choose Printer drop-down box "
-msgstr "Printer namen gemarkeerd met [*] in het Kies Printer veld "
-
-#: ../web/swat.c:1183
-msgid "are autoloaded printers from "
-msgstr "zijn automatisch geladen uit "
-
-#: ../web/swat.c:1184
-msgid "Printcap Name"
-msgstr "Printcap Naam"
-
-#: ../web/swat.c:1185
-msgid "Attempting to delete these printers from SWAT will have no effect."
-msgstr "Proberen deze printers te verwijderen vanuit SWAT zal geen effect hebben."
-
-#: ../web/swat.c:1231
-msgid "Choose Printer"
-msgstr "Kies Printer"
-
-#: ../web/swat.c:1250
-msgid "Delete Printer"
-msgstr "Verwijder Printer"
-
-#: ../web/swat.c:1257
-msgid "Create Printer"
-msgstr "Maak Printer"
-
-#: ../web/statuspage.c:123
-msgid "RDONLY "
-msgstr "RDONLY"
-
-#: ../web/statuspage.c:124
-msgid "WRONLY "
-msgstr "WRONLY"
-
-#: ../web/statuspage.c:125
-msgid "RDWR "
-msgstr "RDWR"
-
-#: ../web/statuspage.c:309
-msgid "Server Status"
-msgstr "Server Status"
-
-#: ../web/statuspage.c:314
-msgid "Auto Refresh"
-msgstr "Automatisch Verversen"
-
-#: ../web/statuspage.c:315 ../web/statuspage.c:320
-msgid "Refresh Interval: "
-msgstr "Ververs Interval:"
-
-#: ../web/statuspage.c:319
-msgid "Stop Refreshing"
-msgstr "Stop met Verversen"
-
-#: ../web/statuspage.c:334
-msgid "version:"
-msgstr "versie:"
-
-#: ../web/statuspage.c:337
-msgid "smbd:"
-msgstr "smbd:"
-
-#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
-msgid "running"
-msgstr "draaiend"
-
-#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
-msgid "not running"
-msgstr "niet draaiend"
-
-#: ../web/statuspage.c:341
-msgid "Stop smbd"
-msgstr "Stop smbd"
-
-#: ../web/statuspage.c:343
-msgid "Start smbd"
-msgstr "Start smbd"
-
-#: ../web/statuspage.c:345
-msgid "Restart smbd"
-msgstr "Herstart smbd"
-
-#: ../web/statuspage.c:350
-msgid "nmbd:"
-msgstr "nmbd:"
-
-#: ../web/statuspage.c:354
-msgid "Stop nmbd"
-msgstr "Stop nmbd"
-
-#: ../web/statuspage.c:356
-msgid "Start nmbd"
-msgstr "Start nmbd"
-
-#: ../web/statuspage.c:358
-msgid "Restart nmbd"
-msgstr "Herstart nmbd"
-
-#: ../web/statuspage.c:364
-msgid "winbindd:"
-msgstr "winbindd:"
-
-#: ../web/statuspage.c:368
-msgid "Stop winbindd"
-msgstr "Stop winbindd"
-
-#: ../web/statuspage.c:370
-msgid "Start winbindd"
-msgstr "Start winbindd"
-
-#: ../web/statuspage.c:372
-msgid "Restart winbindd"
-msgstr "Herstart winbindd"
-
-#. stop, restart all
-#: ../web/statuspage.c:381
-msgid "Stop All"
-msgstr "Stop Alles"
-
-#: ../web/statuspage.c:382
-msgid "Restart All"
-msgstr "Herstart Alles"
-
-#. start all
-#: ../web/statuspage.c:386
-msgid "Start All"
-msgstr "Start Alles"
-
-#: ../web/statuspage.c:393
-msgid "Active Connections"
-msgstr "Actieve Verbindingen"
-
-#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
-msgid "PID"
-msgstr "PID"
-
-#: ../web/statuspage.c:395 ../web/statuspage.c:408
-msgid "Client"
-msgstr "Client"
-
-#: ../web/statuspage.c:395
-msgid "IP address"
-msgstr "IP adres"
-
-#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
-msgid "Date"
-msgstr "Datum"
-
-#: ../web/statuspage.c:397
-msgid "Kill"
-msgstr "Kill"
-
-#: ../web/statuspage.c:405
-msgid "Active Shares"
-msgstr "Actieve Bronnen"
-
-#: ../web/statuspage.c:408
-msgid "Share"
-msgstr "Bron"
-
-#: ../web/statuspage.c:408
-msgid "User"
-msgstr "Gebruiker"
-
-#: ../web/statuspage.c:408
-msgid "Group"
-msgstr "Groep"
-
-#: ../web/statuspage.c:414
-msgid "Open Files"
-msgstr "Geopende Bestanden"
-
-#: ../web/statuspage.c:416
-msgid "Sharing"
-msgstr "Gedeeld"
-
-#: ../web/statuspage.c:416
-msgid "R/W"
-msgstr "Lees/Schrijf"
-
-#: ../web/statuspage.c:416
-msgid "Oplock"
-msgstr "Oplock"
-
-#: ../web/statuspage.c:416
-msgid "File"
-msgstr "Bestand"
-
-#: ../web/statuspage.c:425
-msgid "Show Client in col 1"
-msgstr "Toon Client in kolom 1"
-
-#: ../web/statuspage.c:426
-msgid "Show PID in col 1"
-msgstr "Toon PID in kolom 1"
-
-#: ../param/loadparm.c:755
-msgid "Base Options"
-msgstr "Basis Opties"
-
-#: ../param/loadparm.c:775
-msgid "Security Options"
-msgstr "Veiligheidsopties"
-
-#: ../param/loadparm.c:859
-msgid "Logging Options"
-msgstr "Log Opties"
-
-#: ../param/loadparm.c:874
-msgid "Protocol Options"
-msgstr "Protocol Opties"
-
-#: ../param/loadparm.c:911
-msgid "Tuning Options"
-msgstr "Fijntune Opties"
-
-#: ../param/loadparm.c:940
-msgid "Printing Options"
-msgstr "Printer Opties"
-
-#: ../param/loadparm.c:970
-msgid "Filename Handling"
-msgstr "Bestandsnaam Afhandeling"
-
-#: ../param/loadparm.c:996
-msgid "Domain Options"
-msgstr "Domein Opties"
-
-#: ../param/loadparm.c:1000
-msgid "Logon Options"
-msgstr "Logon Opties"
-
-#: ../param/loadparm.c:1019
-msgid "Browse Options"
-msgstr "Verken Opties"
-
-#: ../param/loadparm.c:1033
-msgid "WINS Options"
-msgstr "WINS Opties"
-
-#: ../param/loadparm.c:1043
-msgid "Locking Options"
-msgstr "Locking Opties"
-
-#: ../param/loadparm.c:1061
-msgid "Ldap Options"
-msgstr "LDAP Opties"
-
-#: ../param/loadparm.c:1078
-msgid "Miscellaneous Options"
-msgstr "Verscheidene Opties"
-
-#: ../param/loadparm.c:1138
-msgid "VFS module options"
-msgstr "VFS module opties"
-
-#: ../param/loadparm.c:1148
-msgid "Winbind options"
-msgstr "Winbind opties"
diff --git a/source3/po/pl.msg b/source3/po/pl.msg
deleted file mode 100644
index aca5de6eb3..0000000000
--- a/source3/po/pl.msg
+++ /dev/null
@@ -1,592 +0,0 @@
-# Polish messages for international release of SWAT.
-# Copyright (C) 2001 Rafal Szczesniak <mimir@spin.ict.pwr.wroc.pl>
-#
-# 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: i18n_swat \n"
-"POT-Creation-Date: 2003-10-06 05:30+0900\n"
-"PO-Revision-Date: 2001-08-15 22:45+02:00\n"
-"Last-Translator: Rafal Szczesniak <mimir@spin.ict.pwr.wroc.pl>\n"
-"Language-Team: pl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-
-#: ../web/swat.c:117
-#, c-format
-msgid "ERROR: Can't open %s"
-msgstr ""
-
-#: ../web/swat.c:200
-msgid "Help"
-msgstr "Pomoc"
-
-#: ../web/swat.c:206 ../web/swat.c:220 ../web/swat.c:235 ../web/swat.c:243 ../web/swat.c:252 ../web/swat.c:261 ../web/swat.c:267 ../web/swat.c:273 ../web/swat.c:286
-msgid "Set Default"
-msgstr "Ustaw domyślnie"
-
-#: ../web/swat.c:408
-#, c-format
-msgid "failed to open %s for writing"
-msgstr ""
-
-#: ../web/swat.c:431
-#, c-format
-msgid "Can't reload %s"
-msgstr ""
-
-#: ../web/swat.c:501
-#, c-format
-msgid "Logged in as <b>%s</b>"
-msgstr "Zalogowany jako <b>%s</b><p>\n"
-
-#: ../web/swat.c:505
-msgid "Home"
-msgstr "Strona domowa"
-
-#: ../web/swat.c:507
-msgid "Globals"
-msgstr "Ustawienia globalne"
-
-#: ../web/swat.c:508
-msgid "Shares"
-msgstr "Współudziały"
-
-#: ../web/swat.c:509
-msgid "Printers"
-msgstr "Drukarki"
-
-#: ../web/swat.c:510
-msgid "Wizard"
-msgstr ""
-
-#: ../web/swat.c:513
-msgid "Status"
-msgstr "Status"
-
-#: ../web/swat.c:514
-msgid "View Config"
-msgstr "Przejrzyj Konfigurację"
-
-#: ../web/swat.c:516
-msgid "Password Management"
-msgstr "Zarządzanie Hasłami"
-
-#: ../web/swat.c:526
-msgid "Current View Is"
-msgstr "Bieżąca Konfiguracja"
-
-#: ../web/swat.c:527 ../web/swat.c:530
-msgid "Basic"
-msgstr "Widok Podstawowy"
-
-#: ../web/swat.c:528 ../web/swat.c:531
-msgid "Advanced"
-msgstr "Widok Zaawansowany"
-
-#: ../web/swat.c:529
-msgid "Change View To"
-msgstr "Zmień Hasło"
-
-#: ../web/swat.c:554
-msgid "Current Config"
-msgstr "Bieżąca Konfiguracja"
-
-#: ../web/swat.c:558
-msgid "Normal View"
-msgstr "Normalny Widok"
-
-#: ../web/swat.c:560
-msgid "Full View"
-msgstr "Pełny Widok"
-
-#. Here we first set and commit all the parameters that were selected
-#. in the previous screen.
-#: ../web/swat.c:579
-msgid "Wizard Parameter Edit Page"
-msgstr ""
-
-#: ../web/swat.c:608
-msgid "Note: smb.conf file has been read and rewritten"
-msgstr ""
-
-#. Here we go ...
-#: ../web/swat.c:716
-msgid "Samba Configuration Wizard"
-msgstr ""
-
-#: ../web/swat.c:720
-msgid "The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."
-msgstr ""
-
-#: ../web/swat.c:721
-msgid "The same will happen if you press the commit button."
-msgstr ""
-
-#: ../web/swat.c:724
-msgid "Rewrite smb.conf file"
-msgstr ""
-
-#: ../web/swat.c:725
-msgid "Commit"
-msgstr "Potwierdź Zmiany"
-
-#: ../web/swat.c:726
-msgid "Edit Parameter Values"
-msgstr "Parametry Drukarki"
-
-#: ../web/swat.c:732
-msgid "Server Type"
-msgstr ""
-
-#: ../web/swat.c:733
-msgid "Stand Alone"
-msgstr "Uruchom nmbd"
-
-#: ../web/swat.c:734
-msgid "Domain Member"
-msgstr ""
-
-#: ../web/swat.c:735
-msgid "Domain Controller"
-msgstr ""
-
-#: ../web/swat.c:738
-msgid "Unusual Type in smb.conf - Please Select New Mode"
-msgstr ""
-
-#: ../web/swat.c:740
-msgid "Configure WINS As"
-msgstr ""
-
-#: ../web/swat.c:741
-msgid "Not Used"
-msgstr ""
-
-#: ../web/swat.c:742
-msgid "Server for client use"
-msgstr ""
-
-#: ../web/swat.c:743
-msgid "Client of another WINS server"
-msgstr ""
-
-#: ../web/swat.c:745
-msgid "Remote WINS Server"
-msgstr ""
-
-#: ../web/swat.c:756
-msgid "Error: WINS Server Mode and WINS Support both set in smb.conf"
-msgstr ""
-
-#: ../web/swat.c:757
-msgid "Please Select desired WINS mode above."
-msgstr ""
-
-#: ../web/swat.c:759
-msgid "Expose Home Directories"
-msgstr ""
-
-#: ../web/swat.c:774
-msgid "The above configuration options will set multiple parameters and will generally assist with rapid Samba deployment."
-msgstr ""
-
-#: ../web/swat.c:787
-msgid "Global Parameters"
-msgstr "Zmienne Globalne"
-
-#: ../web/swat.c:815 ../web/swat.c:916 ../web/swat.c:1265
-msgid "Commit Changes"
-msgstr "Potwierdź Zmiany"
-
-#: ../web/swat.c:819 ../web/swat.c:919 ../web/swat.c:1267
-msgid "Reset Values"
-msgstr "Zresetuj Wartości"
-
-#: ../web/swat.c:844
-msgid "Share Parameters"
-msgstr "Parametry Współudziału"
-
-#: ../web/swat.c:887
-msgid "Choose Share"
-msgstr "Wybierz Współudział"
-
-#: ../web/swat.c:901
-msgid "Delete Share"
-msgstr "Usuń Współudział"
-
-#: ../web/swat.c:908
-msgid "Create Share"
-msgstr "Utwórz Współudział"
-
-#: ../web/swat.c:944
-msgid "password change in demo mode rejected"
-msgstr "zmiana hasła w trybie demo odrzucona\n"
-
-#: ../web/swat.c:957
-msgid "Can't setup password database vectors."
-msgstr ""
-
-#: ../web/swat.c:983
-msgid " Must specify \"User Name\" "
-msgstr " Musisz podać \"Nazwę Użytkownika\" \n"
-
-#: ../web/swat.c:999
-msgid " Must specify \"Old Password\" "
-msgstr " Musisz podać \"Stare Hasło\" \n"
-
-#: ../web/swat.c:1005
-msgid " Must specify \"Remote Machine\" "
-msgstr " Musisz podać \"Zdalną Maszynę\" \n"
-
-#: ../web/swat.c:1012
-msgid " Must specify \"New, and Re-typed Passwords\" "
-msgstr " Musisz podać \"Nowe Hasło, i ponownie wpisane Nowe Hasło\" \n"
-
-#: ../web/swat.c:1018
-msgid " Re-typed password didn't match new password "
-msgstr " Ponownie wpisane hasło nie pasuje do nowego hasła\n"
-
-#: ../web/swat.c:1048
-#, c-format
-msgid " The passwd for '%s' has been changed."
-msgstr " Hasło dla '%s' zostało zmienione. \n"
-
-#: ../web/swat.c:1051
-#, c-format
-msgid " The passwd for '%s' has NOT been changed."
-msgstr " Hasło dla '%s' NIE zostało zmienione. \n"
-
-#: ../web/swat.c:1076
-msgid "Server Password Management"
-msgstr "Zarządzanie Hasłami na Serwerze"
-
-#.
-#. * Create all the dialog boxes for data collection
-#.
-#: ../web/swat.c:1085 ../web/swat.c:1132
-msgid "User Name"
-msgstr " Nazwa Użytkownika"
-
-#: ../web/swat.c:1088 ../web/swat.c:1134
-msgid "Old Password"
-msgstr " Stare Hasło"
-
-#: ../web/swat.c:1091 ../web/swat.c:1136
-msgid "New Password"
-msgstr " Nowe Hasło"
-
-#: ../web/swat.c:1093 ../web/swat.c:1138
-msgid "Re-type New Password"
-msgstr " Ponownie wpisz Nowe Hasło"
-
-#: ../web/swat.c:1101 ../web/swat.c:1149
-msgid "Change Password"
-msgstr "Zmień Hasło"
-
-#: ../web/swat.c:1104
-msgid "Add New User"
-msgstr "Dodaj Nowego Użytkownika"
-
-#: ../web/swat.c:1106
-msgid "Delete User"
-msgstr "Usuń Użytkownika"
-
-#: ../web/swat.c:1108
-msgid "Disable User"
-msgstr "Zablokuj Użytkownika"
-
-#: ../web/swat.c:1110
-msgid "Enable User"
-msgstr "Odblokuj Użytkownika"
-
-#: ../web/swat.c:1123
-msgid "Client/Server Password Management"
-msgstr "Zarządzanie Hasłami Klient/Serwer"
-
-#: ../web/swat.c:1140
-msgid "Remote Machine"
-msgstr " Zdalna Maszyna"
-
-#: ../web/swat.c:1179
-msgid "Printer Parameters"
-msgstr "Parametry Drukarki"
-
-#: ../web/swat.c:1181
-msgid "Important Note:"
-msgstr "Ważna Informacja:"
-
-#: ../web/swat.c:1182
-msgid "Printer names marked with [*] in the Choose Printer drop-down box "
-msgstr "Nazwy Drukarek zaznaczone [*] w rozwijanym polu Wybierz Drukarkę "
-
-#: ../web/swat.c:1183
-msgid "are autoloaded printers from "
-msgstr "są drukarkami automatycznie ładowanymi z "
-
-#: ../web/swat.c:1184
-msgid "Printcap Name"
-msgstr "Nazwa Printcap"
-
-#: ../web/swat.c:1185
-msgid "Attempting to delete these printers from SWAT will have no effect."
-msgstr "Próby usunięcia tych drukarek ze SWAT nie przyniosą efektu.\n"
-
-#: ../web/swat.c:1231
-msgid "Choose Printer"
-msgstr "Wybierz Drukarkę"
-
-#: ../web/swat.c:1250
-msgid "Delete Printer"
-msgstr "Usuń Drukarkę"
-
-#: ../web/swat.c:1257
-msgid "Create Printer"
-msgstr "Utwórz Drukarkę"
-
-#: ../web/statuspage.c:123
-msgid "RDONLY "
-msgstr ""
-
-#: ../web/statuspage.c:124
-msgid "WRONLY "
-msgstr ""
-
-#: ../web/statuspage.c:125
-msgid "RDWR "
-msgstr ""
-
-#: ../web/statuspage.c:309
-msgid "Server Status"
-msgstr "Status Serwera"
-
-#: ../web/statuspage.c:314
-msgid "Auto Refresh"
-msgstr "Automatyczne Odświeżanie"
-
-#: ../web/statuspage.c:315 ../web/statuspage.c:320
-msgid "Refresh Interval: "
-msgstr "Interwał Odświeżania: "
-
-#: ../web/statuspage.c:319
-msgid "Stop Refreshing"
-msgstr "Zatrzymaj Odświeżanie"
-
-#: ../web/statuspage.c:334
-msgid "version:"
-msgstr "wersja:"
-
-#: ../web/statuspage.c:337
-msgid "smbd:"
-msgstr ""
-
-#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
-msgid "running"
-msgstr "działa"
-
-#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
-msgid "not running"
-msgstr "nie działa"
-
-#: ../web/statuspage.c:341
-msgid "Stop smbd"
-msgstr "Zatrzymaj smbd"
-
-#: ../web/statuspage.c:343
-msgid "Start smbd"
-msgstr "Uruchom smbd"
-
-#: ../web/statuspage.c:345
-msgid "Restart smbd"
-msgstr "Zrestartuj smbd"
-
-#: ../web/statuspage.c:350
-msgid "nmbd:"
-msgstr ""
-
-#: ../web/statuspage.c:354
-msgid "Stop nmbd"
-msgstr "Zatrzymaj nmbd"
-
-#: ../web/statuspage.c:356
-msgid "Start nmbd"
-msgstr "Uruchom nmbd"
-
-#: ../web/statuspage.c:358
-msgid "Restart nmbd"
-msgstr "Zrestartuj nmbd"
-
-#: ../web/statuspage.c:364
-msgid "winbindd:"
-msgstr ""
-
-#: ../web/statuspage.c:368
-msgid "Stop winbindd"
-msgstr "Zatrzymaj nmbd"
-
-#: ../web/statuspage.c:370
-msgid "Start winbindd"
-msgstr "Uruchom nmbd"
-
-#: ../web/statuspage.c:372
-msgid "Restart winbindd"
-msgstr "Zrestartuj nmbd"
-
-#. stop, restart all
-#: ../web/statuspage.c:381
-msgid "Stop All"
-msgstr ""
-
-#: ../web/statuspage.c:382
-msgid "Restart All"
-msgstr "Zrestartuj nmbd"
-
-#. start all
-#: ../web/statuspage.c:386
-msgid "Start All"
-msgstr "Uruchom nmbd"
-
-#: ../web/statuspage.c:393
-msgid "Active Connections"
-msgstr "Aktywne Połączenia"
-
-#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
-msgid "PID"
-msgstr ""
-
-#: ../web/statuspage.c:395 ../web/statuspage.c:408
-msgid "Client"
-msgstr "Klient"
-
-#: ../web/statuspage.c:395
-msgid "IP address"
-msgstr "adres IP"
-
-#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
-msgid "Date"
-msgstr "Data"
-
-#: ../web/statuspage.c:397
-msgid "Kill"
-msgstr "Zatrzymaj"
-
-#: ../web/statuspage.c:405
-msgid "Active Shares"
-msgstr "Aktywne Współudziały"
-
-#: ../web/statuspage.c:408
-msgid "Share"
-msgstr "Współudział"
-
-#: ../web/statuspage.c:408
-msgid "User"
-msgstr "Użytkownik"
-
-#: ../web/statuspage.c:408
-msgid "Group"
-msgstr "Grupa"
-
-#: ../web/statuspage.c:414
-msgid "Open Files"
-msgstr "Otwarte Pliki"
-
-#: ../web/statuspage.c:416
-msgid "Sharing"
-msgstr "Współdzielenie"
-
-#: ../web/statuspage.c:416
-msgid "R/W"
-msgstr ""
-
-#: ../web/statuspage.c:416
-msgid "Oplock"
-msgstr ""
-
-#: ../web/statuspage.c:416
-msgid "File"
-msgstr "Plik"
-
-#: ../web/statuspage.c:425
-msgid "Show Client in col 1"
-msgstr ""
-
-#: ../web/statuspage.c:426
-msgid "Show PID in col 1"
-msgstr ""
-
-#: ../param/loadparm.c:755
-msgid "Base Options"
-msgstr "Bazowe Opcje"
-
-#: ../param/loadparm.c:775
-msgid "Security Options"
-msgstr "Opcje Zabezpieczeń"
-
-#: ../param/loadparm.c:859
-msgid "Logging Options"
-msgstr "Opcje Blokowania"
-
-#: ../param/loadparm.c:874
-msgid "Protocol Options"
-msgstr "Opcje Protokołu"
-
-#: ../param/loadparm.c:911
-msgid "Tuning Options"
-msgstr "Opcje Dostrajające"
-
-#: ../param/loadparm.c:940
-msgid "Printing Options"
-msgstr "Opcje Drukowania"
-
-#: ../param/loadparm.c:970
-msgid "Filename Handling"
-msgstr "Obsługa Nazw Plików"
-
-#: ../param/loadparm.c:996
-msgid "Domain Options"
-msgstr "Opcje Domeny"
-
-#: ../param/loadparm.c:1000
-msgid "Logon Options"
-msgstr "Opcje Logowania"
-
-#: ../param/loadparm.c:1019
-msgid "Browse Options"
-msgstr "Opcje Przeglądania"
-
-#: ../param/loadparm.c:1033
-msgid "WINS Options"
-msgstr "Opcje WINS"
-
-#: ../param/loadparm.c:1043
-msgid "Locking Options"
-msgstr "Opcje Blokowania"
-
-#: ../param/loadparm.c:1061
-msgid "Ldap Options"
-msgstr "Opcje Ldap"
-
-#: ../param/loadparm.c:1078
-msgid "Miscellaneous Options"
-msgstr "Pozostałe Opcje"
-
-#: ../param/loadparm.c:1138
-msgid "VFS module options"
-msgstr "Opcje WINS"
-
-#: ../param/loadparm.c:1148
-msgid "Winbind options"
-msgstr "Opcje Drukowania"
diff --git a/source3/po/ru.msg b/source3/po/ru.msg
deleted file mode 100644
index d859406ccb..0000000000
--- a/source3/po/ru.msg
+++ /dev/null
@@ -1,606 +0,0 @@
-# Russian messages for international release of SWAT.
-# Copyright (C) 2007 Yuri Kozlov <kozlov.y@gmail.com>
-#
-# 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-27 22:00+0400\n"
-"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
-"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#: ../web/swat.c:139
-#, c-format
-msgid "ERROR: Can't open %s"
-msgstr "ОШИБКА: Не удалось открыть %s"
-
-#: ../web/swat.c:223
-msgid "Help"
-msgstr "Справка"
-
-#: ../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 "Установить по умолчанию"
-
-#: ../web/swat.c:450
-#, c-format
-msgid "failed to open %s for writing"
-msgstr "не удалось открыть %s для записи"
-
-#: ../web/swat.c:473
-#, c-format
-msgid "Can't reload %s"
-msgstr "Невозможно перезагрузить %s"
-
-#: ../web/swat.c:543
-#, c-format
-msgid "Logged in as <b>%s</b>"
-msgstr "Осуществлён вход под именем <b>%s</b>"
-
-#: ../web/swat.c:547
-msgid "Home"
-msgstr "Главная"
-
-#: ../web/swat.c:549
-msgid "Globals"
-msgstr "Глобальные"
-
-#: ../web/swat.c:550
-msgid "Shares"
-msgstr "Ресурсы"
-
-#: ../web/swat.c:551
-msgid "Printers"
-msgstr "Принтеры"
-
-#: ../web/swat.c:552
-msgid "Wizard"
-msgstr "Помощник"
-
-#: ../web/swat.c:556
-msgid "Status"
-msgstr "Состояние"
-
-#: ../web/swat.c:557
-msgid "View Config"
-msgstr "Настройки"
-
-#: ../web/swat.c:559
-msgid "Password Management"
-msgstr "Пароли"
-
-#: ../web/swat.c:569
-msgid "Current View Is"
-msgstr "Текущий вид"
-
-#: ../web/swat.c:570 ../web/swat.c:573
-msgid "Basic"
-msgstr "Простой"
-
-#: ../web/swat.c:571 ../web/swat.c:574
-msgid "Advanced"
-msgstr "Сложный"
-
-#: ../web/swat.c:572
-msgid "Change View To"
-msgstr "Сменить вид на"
-
-#: ../web/swat.c:601
-msgid "Current Config"
-msgstr "Текущий файл конфигурации"
-
-#: ../web/swat.c:605
-msgid "Normal View"
-msgstr "Обычный вид"
-
-#: ../web/swat.c:607
-msgid "Full View"
-msgstr "Полный вид"
-
-#. Here we first set and commit all the parameters that were selected
-#. in the previous screen.
-#: ../web/swat.c:626
-msgid "Wizard Parameter Edit Page"
-msgstr "Страница редактирования параметров помощника"
-
-#: ../web/swat.c:655
-msgid "Note: smb.conf file has been read and rewritten"
-msgstr "Замечание: файл smb.conf был прочитан и перезаписан"
-
-#. Here we go ...
-#: ../web/swat.c:763
-msgid "Samba Configuration Wizard"
-msgstr "Помощник настройки Samba"
-
-#: ../web/swat.c:767
-msgid "The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."
-msgstr ""
-"По кнопке \"Перезаписать файл smb.conf\" в файл smb.conf записываются все "
-"значения по умолчанию с комментариями."
-
-#: ../web/swat.c:768
-msgid "The same will happen if you press the commit button."
-msgstr "То же самое произойдёт при нажатии кнопки сохранения."
-
-#: ../web/swat.c:771
-msgid "Rewrite smb.conf file"
-msgstr "Перезаписать файл smb.conf"
-
-#: ../web/swat.c:772
-msgid "Commit"
-msgstr "Сохранить"
-
-#: ../web/swat.c:773
-msgid "Edit Parameter Values"
-msgstr "Редактировать значения параметров"
-
-#: ../web/swat.c:779
-msgid "Server Type"
-msgstr "Тип сервера"
-
-#: ../web/swat.c:780
-msgid "Stand Alone"
-msgstr "Независимый"
-
-#: ../web/swat.c:781
-msgid "Domain Member"
-msgstr "Член домена"
-
-#: ../web/swat.c:782
-msgid "Domain Controller"
-msgstr "Контроллер домена"
-
-#: ../web/swat.c:785
-msgid "Unusual Type in smb.conf - Please Select New Mode"
-msgstr "Необычный тип в smb.conf - Выберите новый режим"
-
-#: ../web/swat.c:787
-msgid "Configure WINS As"
-msgstr "Настроить WINS как"
-
-#: ../web/swat.c:788
-msgid "Not Used"
-msgstr "Не использовать"
-
-#: ../web/swat.c:789
-msgid "Server for client use"
-msgstr "Сервер для клиентов"
-
-#: ../web/swat.c:790
-msgid "Client of another WINS server"
-msgstr "Клиент другого сервера WINS"
-
-#: ../web/swat.c:792
-msgid "Remote WINS Server"
-msgstr "Удалённый сервер WINS"
-
-#: ../web/swat.c:803
-msgid "Error: WINS Server Mode and WINS Support both set in smb.conf"
-msgstr "Ошибка: в smb.conf установлены одновременно режим сервера WINS и поддержка WINS"
-
-#: ../web/swat.c:804
-msgid "Please Select desired WINS mode above."
-msgstr "Выберите желаемый режим WINS."
-
-#: ../web/swat.c:806
-msgid "Expose Home Directories"
-msgstr "Сделать доступными домашние каталоги"
-
-#: ../web/swat.c:821
-msgid "The above configuration options will set multiple parameters and will generally assist with rapid Samba deployment."
-msgstr ""
-"Выбор параметров выше приводит к автоматической настройке большего числа "
-"параметров, и помогает в сокращении времени развёртывания Samba."
-
-#: ../web/swat.c:834
-msgid "Global Parameters"
-msgstr "Глобальные параметры"
-
-#: ../web/swat.c:862 ../web/swat.c:966 ../web/swat.c:1318
-msgid "Commit Changes"
-msgstr "Сохранить изменения"
-
-#: ../web/swat.c:866 ../web/swat.c:969 ../web/swat.c:1320
-msgid "Reset Values"
-msgstr "Реинициализировать значения"
-
-#: ../web/swat.c:891
-msgid "Share Parameters"
-msgstr "Параметры общих ресурсов"
-
-#: ../web/swat.c:934
-msgid "Choose Share"
-msgstr "Выбрать ресурс"
-
-#: ../web/swat.c:951
-msgid "Delete Share"
-msgstr "Удалить ресурс"
-
-#: ../web/swat.c:958
-msgid "Create Share"
-msgstr "Создать ресурс"
-
-#: ../web/swat.c:994
-msgid "password change in demo mode rejected"
-msgstr "смена пароля в демо-режиме не работает"
-
-#: ../web/swat.c:1007
-msgid "Can't setup password database vectors."
-msgstr "Не удалось настроить векторы базы данных паролей."
-
-#: ../web/swat.c:1033
-msgid " Must specify \"User Name\" "
-msgstr " Должно быть указано \"Имя пользователя\" "
-
-#: ../web/swat.c:1049
-msgid " Must specify \"Old Password\" "
-msgstr " Должен быть указан \"Старый пароль\" "
-
-#: ../web/swat.c:1055
-msgid " Must specify \"Remote Machine\" "
-msgstr " Должна быть указана \"Удалённая машина\" "
-
-#: ../web/swat.c:1062
-msgid " Must specify \"New, and Re-typed Passwords\" "
-msgstr " Должен быть указан \"Новый пароль, введённый дважды\" "
-
-#: ../web/swat.c:1068
-msgid " Re-typed password didn't match new password "
-msgstr " Повторно набранный новый пароль не совпадает с новым паролем "
-
-#: ../web/swat.c:1101
-#, c-format
-msgid " The passwd for '%s' has been changed."
-msgstr " Был изменён пароль для '%s'."
-
-#: ../web/swat.c:1104
-#, c-format
-msgid " The passwd for '%s' has NOT been changed."
-msgstr " Пароль для '%s' НЕ был изменён."
-
-#: ../web/swat.c:1129
-msgid "Server Password Management"
-msgstr "Управление паролями сервера"
-
-#.
-#. * Create all the dialog boxes for data collection
-#.
-#: ../web/swat.c:1138 ../web/swat.c:1185
-msgid "User Name"
-msgstr "Имя пользователя"
-
-#: ../web/swat.c:1141 ../web/swat.c:1187
-msgid "Old Password"
-msgstr "Старый пароль"
-
-#: ../web/swat.c:1144 ../web/swat.c:1189
-msgid "New Password"
-msgstr "Новый пароль"
-
-#: ../web/swat.c:1146 ../web/swat.c:1191
-msgid "Re-type New Password"
-msgstr "Новый пароль ещё раз"
-
-#: ../web/swat.c:1154 ../web/swat.c:1202
-msgid "Change Password"
-msgstr "Сменить пароль"
-
-#: ../web/swat.c:1157
-msgid "Add New User"
-msgstr "Добавить нового пользователя"
-
-#: ../web/swat.c:1159
-msgid "Delete User"
-msgstr "Удалить пользователя"
-
-#: ../web/swat.c:1161
-msgid "Disable User"
-msgstr "Заблокировать пользователя"
-
-#: ../web/swat.c:1163
-msgid "Enable User"
-msgstr "Разблокировать пользователя"
-
-#: ../web/swat.c:1176
-msgid "Client/Server Password Management"
-msgstr "Управление паролями в режиме клиент/сервер"
-
-#: ../web/swat.c:1193
-msgid "Remote Machine"
-msgstr "Удалённая машина"
-
-#: ../web/swat.c:1232
-msgid "Printer Parameters"
-msgstr "Параметры принтера"
-
-#: ../web/swat.c:1234
-msgid "Important Note:"
-msgstr "Важное замечание:"
-
-#: ../web/swat.c:1235
-#, c-format
-msgid "Printer names marked with [*] in the Choose Printer drop-down box "
-msgstr "Имена принтеров, помеченные [*] в выпадающем списке принтеров, "
-
-#: ../web/swat.c:1236
-#, c-format
-msgid "are autoloaded printers from "
-msgstr "были автоматически загружены согласно параметру "
-
-#: ../web/swat.c:1237
-msgid "Printcap Name"
-msgstr "Printcap Name"
-
-#: ../web/swat.c:1238
-msgid "Attempting to delete these printers from SWAT will have no effect."
-msgstr ". Попытка удалить эти принтеры из SWAT ни к чему не приведёт."
-
-#: ../web/swat.c:1284
-msgid "Choose Printer"
-msgstr "Выбрать принтер"
-
-#: ../web/swat.c:1303
-msgid "Delete Printer"
-msgstr "Удалить принтер"
-
-#: ../web/swat.c:1310
-msgid "Create Printer"
-msgstr "Создать принтер"
-
-#: ../web/statuspage.c:139
-msgid "RDWR "
-msgstr "RDWR "
-
-#: ../web/statuspage.c:141
-msgid "WRONLY "
-msgstr "WRONLY "
-
-#: ../web/statuspage.c:143
-msgid "RDONLY "
-msgstr "RDONLY "
-
-#: ../web/statuspage.c:330
-msgid "Server Status"
-msgstr "Состояние сервера"
-
-#: ../web/statuspage.c:335
-msgid "Auto Refresh"
-msgstr "Включить автообновление"
-
-#: ../web/statuspage.c:336 ../web/statuspage.c:341
-msgid "Refresh Interval: "
-msgstr "Интервал автообновления: "
-
-#: ../web/statuspage.c:340
-msgid "Stop Refreshing"
-msgstr "Выключить автообновление"
-
-#: ../web/statuspage.c:355
-msgid "version:"
-msgstr "версия:"
-
-#: ../web/statuspage.c:358
-msgid "smbd:"
-msgstr "smbd:"
-
-#: ../web/statuspage.c:358 ../web/statuspage.c:371 ../web/statuspage.c:385
-msgid "running"
-msgstr "работает"
-
-#: ../web/statuspage.c:358 ../web/statuspage.c:371 ../web/statuspage.c:385
-msgid "not running"
-msgstr "не работает"
-
-#: ../web/statuspage.c:362
-msgid "Stop smbd"
-msgstr "Остановить smbd"
-
-#: ../web/statuspage.c:364
-msgid "Start smbd"
-msgstr "Запустить smbd"
-
-#: ../web/statuspage.c:366
-msgid "Restart smbd"
-msgstr "Перезапустить smbd"
-
-#: ../web/statuspage.c:371
-msgid "nmbd:"
-msgstr "nmbd:"
-
-#: ../web/statuspage.c:375
-msgid "Stop nmbd"
-msgstr "Остановить nmbd"
-
-#: ../web/statuspage.c:377
-msgid "Start nmbd"
-msgstr "Запустить nmbd"
-
-#: ../web/statuspage.c:379
-msgid "Restart nmbd"
-msgstr "Перезапустить nmbd"
-
-#: ../web/statuspage.c:385
-msgid "winbindd:"
-msgstr "winbindd:"
-
-#: ../web/statuspage.c:389
-msgid "Stop winbindd"
-msgstr "Остановить winbindd"
-
-#: ../web/statuspage.c:391
-msgid "Start winbindd"
-msgstr "Запустить winbindd"
-
-#: ../web/statuspage.c:393
-msgid "Restart winbindd"
-msgstr "Перезапустить winbindd"
-
-#. stop, restart all
-#: ../web/statuspage.c:402
-msgid "Stop All"
-msgstr "Остановить всё"
-
-#: ../web/statuspage.c:403
-msgid "Restart All"
-msgstr "Перезапустить всё"
-
-#. start all
-#: ../web/statuspage.c:407
-msgid "Start All"
-msgstr "Запустить всё"
-
-#: ../web/statuspage.c:414
-msgid "Active Connections"
-msgstr "Активные подключения"
-
-#: ../web/statuspage.c:416 ../web/statuspage.c:429 ../web/statuspage.c:437
-msgid "PID"
-msgstr "PID"
-
-#: ../web/statuspage.c:416 ../web/statuspage.c:429
-msgid "Client"
-msgstr "Клиент"
-
-#: ../web/statuspage.c:416
-msgid "IP address"
-msgstr "IP-адрес"
-
-#: ../web/statuspage.c:416 ../web/statuspage.c:429 ../web/statuspage.c:437
-msgid "Date"
-msgstr "Дата"
-
-#: ../web/statuspage.c:418
-msgid "Kill"
-msgstr "Отключить"
-
-#: ../web/statuspage.c:426
-msgid "Active Shares"
-msgstr "Активные ресурсы"
-
-#: ../web/statuspage.c:429
-msgid "Share"
-msgstr "Ресурс"
-
-#: ../web/statuspage.c:429
-msgid "User"
-msgstr "Пользователь"
-
-#: ../web/statuspage.c:429
-msgid "Group"
-msgstr "Группа"
-
-#: ../web/statuspage.c:435
-msgid "Open Files"
-msgstr "Открытые файлы"
-
-#: ../web/statuspage.c:437
-msgid "Sharing"
-msgstr "Ресурс"
-
-#: ../web/statuspage.c:437
-msgid "R/W"
-msgstr "R/W"
-
-#: ../web/statuspage.c:437
-msgid "Oplock"
-msgstr "Oplock"
-
-#: ../web/statuspage.c:437
-msgid "File"
-msgstr "Файл"
-
-#: ../web/statuspage.c:446
-msgid "Show Client in col 1"
-msgstr "Показать клиента в колонке 1"
-
-#: ../web/statuspage.c:447
-msgid "Show PID in col 1"
-msgstr "Показать PID в колонке 1"
-
-#: ../param/loadparm.c:836
-msgid "Base Options"
-msgstr "Основные параметры"
-
-#: ../param/loadparm.c:855
-msgid "Security Options"
-msgstr "Параметры безопасности"
-
-#: ../param/loadparm.c:945
-msgid "Logging Options"
-msgstr "Параметры журнала"
-
-#: ../param/loadparm.c:962
-msgid "Protocol Options"
-msgstr "Параметры протокола"
-
-#: ../param/loadparm.c:1008
-msgid "Tuning Options"
-msgstr "Параметры детальной настройки"
-
-#: ../param/loadparm.c:1037
-msgid "Printing Options"
-msgstr "Параметры печати"
-
-#: ../param/loadparm.c:1075
-msgid "Filename Handling"
-msgstr "Обработка имён файлов"
-
-#: ../param/loadparm.c:1105
-msgid "Domain Options"
-msgstr "Параметры домена"
-
-#: ../param/loadparm.c:1109
-msgid "Logon Options"
-msgstr "Параметры входа"
-
-#: ../param/loadparm.c:1130
-msgid "Browse Options"
-msgstr "Параметры обзора"
-
-#: ../param/loadparm.c:1144
-msgid "WINS Options"
-msgstr "Параметры WINS"
-
-#: ../param/loadparm.c:1153
-msgid "Locking Options"
-msgstr "Параметры блокировки"
-
-#: ../param/loadparm.c:1170
-msgid "Ldap Options"
-msgstr "Параметры Ldap"
-
-#: ../param/loadparm.c:1186
-msgid "Miscellaneous Options"
-msgstr "Различные параметры"
-
-#: ../param/loadparm.c:1191
-msgid "EventLog Options"
-msgstr "Параметры EventLog"
-
-#: ../param/loadparm.c:1258
-msgid "VFS module options"
-msgstr "Параметры модуля VFS"
-
-#: ../param/loadparm.c:1268
-msgid "Winbind options"
-msgstr "Параметры Winbind"
-
diff --git a/source3/po/tr.msg b/source3/po/tr.msg
deleted file mode 100644
index 03b489d033..0000000000
--- a/source3/po/tr.msg
+++ /dev/null
@@ -1,593 +0,0 @@
-# Turkish messages for international release of SWAT.
-# Copyright (C) 2001 Deniz Akkus Kanca <deniz@arayan.com>
-#
-# 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: i18n_swat \n"
-"POT-Creation-Date: 2003-10-06 05:30+0900\n"
-"PO-Revision-Date: 2001-09-20 22:51EEST\n"
-"Last-Translator: Deniz Akkus Kanca <deniz@arayan.com>\n"
-"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.9.1\n"
-
-#: ../web/swat.c:117
-#, c-format
-msgid "ERROR: Can't open %s"
-msgstr ""
-
-#: ../web/swat.c:200
-msgid "Help"
-msgstr "Yardım"
-
-#: ../web/swat.c:206 ../web/swat.c:220 ../web/swat.c:235 ../web/swat.c:243 ../web/swat.c:252 ../web/swat.c:261 ../web/swat.c:267 ../web/swat.c:273 ../web/swat.c:286
-msgid "Set Default"
-msgstr "Öntanımlıya Ayarla"
-
-#: ../web/swat.c:408
-#, c-format
-msgid "failed to open %s for writing"
-msgstr ""
-
-#: ../web/swat.c:431
-#, c-format
-msgid "Can't reload %s"
-msgstr ""
-
-#: ../web/swat.c:501
-#, c-format
-msgid "Logged in as <b>%s</b>"
-msgstr "<b>%s</b> kimliği ile oturum açılmış"
-
-#: ../web/swat.c:505
-msgid "Home"
-msgstr "Ev"
-
-#: ../web/swat.c:507
-msgid "Globals"
-msgstr "Evrenseller"
-
-#: ../web/swat.c:508
-msgid "Shares"
-msgstr "Paylaşımlar"
-
-#: ../web/swat.c:509
-msgid "Printers"
-msgstr "Yazıcılar"
-
-#: ../web/swat.c:510
-msgid "Wizard"
-msgstr ""
-
-#: ../web/swat.c:513
-msgid "Status"
-msgstr "Durum"
-
-#: ../web/swat.c:514
-msgid "View Config"
-msgstr "Ayarlara Gözat"
-
-#: ../web/swat.c:516
-msgid "Password Management"
-msgstr "Şifre Yönetimi"
-
-#: ../web/swat.c:526
-msgid "Current View Is"
-msgstr "Şimdiki Ayarlar"
-
-#: ../web/swat.c:527 ../web/swat.c:530
-msgid "Basic"
-msgstr "Temel Görünüm"
-
-#: ../web/swat.c:528 ../web/swat.c:531
-msgid "Advanced"
-msgstr "Gelişmiş Görünüm"
-
-#: ../web/swat.c:529
-msgid "Change View To"
-msgstr "Şifre Değiştir"
-
-#: ../web/swat.c:554
-msgid "Current Config"
-msgstr "Şimdiki Ayarlar"
-
-#: ../web/swat.c:558
-msgid "Normal View"
-msgstr "Normal Görünüm"
-
-#: ../web/swat.c:560
-msgid "Full View"
-msgstr "Tam Görünüm"
-
-#. Here we first set and commit all the parameters that were selected
-#. in the previous screen.
-#: ../web/swat.c:579
-msgid "Wizard Parameter Edit Page"
-msgstr ""
-
-#: ../web/swat.c:608
-msgid "Note: smb.conf file has been read and rewritten"
-msgstr ""
-
-#. Here we go ...
-#: ../web/swat.c:716
-msgid "Samba Configuration Wizard"
-msgstr ""
-
-#: ../web/swat.c:720
-msgid "The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."
-msgstr ""
-
-#: ../web/swat.c:721
-msgid "The same will happen if you press the commit button."
-msgstr ""
-
-#: ../web/swat.c:724
-msgid "Rewrite smb.conf file"
-msgstr ""
-
-#: ../web/swat.c:725
-msgid "Commit"
-msgstr "açıklama"
-
-#: ../web/swat.c:726
-msgid "Edit Parameter Values"
-msgstr "Yazıcı Bilgileri"
-
-#: ../web/swat.c:732
-msgid "Server Type"
-msgstr ""
-
-#: ../web/swat.c:733
-msgid "Stand Alone"
-msgstr "Nmbd'yi çalıştır"
-
-#: ../web/swat.c:734
-msgid "Domain Member"
-msgstr "alan sunucusu"
-
-#: ../web/swat.c:735
-msgid "Domain Controller"
-msgstr "alan sunucusu"
-
-#: ../web/swat.c:738
-msgid "Unusual Type in smb.conf - Please Select New Mode"
-msgstr ""
-
-#: ../web/swat.c:740
-msgid "Configure WINS As"
-msgstr ""
-
-#: ../web/swat.c:741
-msgid "Not Used"
-msgstr "dont descend"
-
-#: ../web/swat.c:742
-msgid "Server for client use"
-msgstr ""
-
-#: ../web/swat.c:743
-msgid "Client of another WINS server"
-msgstr ""
-
-#: ../web/swat.c:745
-msgid "Remote WINS Server"
-msgstr ""
-
-#: ../web/swat.c:756
-msgid "Error: WINS Server Mode and WINS Support both set in smb.conf"
-msgstr ""
-
-#: ../web/swat.c:757
-msgid "Please Select desired WINS mode above."
-msgstr ""
-
-#: ../web/swat.c:759
-msgid "Expose Home Directories"
-msgstr ""
-
-#: ../web/swat.c:774
-msgid "The above configuration options will set multiple parameters and will generally assist with rapid Samba deployment."
-msgstr ""
-
-#: ../web/swat.c:787
-msgid "Global Parameters"
-msgstr "Genel Değişkenler"
-
-#: ../web/swat.c:815 ../web/swat.c:916 ../web/swat.c:1265
-msgid "Commit Changes"
-msgstr "Değişiklikleri Kaydet"
-
-#: ../web/swat.c:819 ../web/swat.c:919 ../web/swat.c:1267
-msgid "Reset Values"
-msgstr "Değerleri İlk Haline Getir"
-
-#: ../web/swat.c:844
-msgid "Share Parameters"
-msgstr "Paylaşım Parametreleri"
-
-#: ../web/swat.c:887
-msgid "Choose Share"
-msgstr "Paylaşım Seçin"
-
-#: ../web/swat.c:901
-msgid "Delete Share"
-msgstr "Paylaşım Kaldır"
-
-#: ../web/swat.c:908
-msgid "Create Share"
-msgstr "Paylaşım Oluştur"
-
-#: ../web/swat.c:944
-msgid "password change in demo mode rejected"
-msgstr "demo kipinde şifre değişikliği kabul edilmedi\n"
-
-#: ../web/swat.c:957
-msgid "Can't setup password database vectors."
-msgstr ""
-
-#: ../web/swat.c:983
-msgid " Must specify \"User Name\" "
-msgstr " \"Kullanıcı Adı\" belirtilmeli \n"
-
-#: ../web/swat.c:999
-msgid " Must specify \"Old Password\" "
-msgstr " \"Eski Şifre\" belirtilmeli \n"
-
-#: ../web/swat.c:1005
-msgid " Must specify \"Remote Machine\" "
-msgstr " \"Uzak Makina\" belirtilmeli \n"
-
-#: ../web/swat.c:1012
-msgid " Must specify \"New, and Re-typed Passwords\" "
-msgstr " \"Yeni ve Tekrar Girilmiş Şifreler\" belirtilmeli \n"
-
-#: ../web/swat.c:1018
-msgid " Re-typed password didn't match new password "
-msgstr " Tekrar girilen şifre yeni şifre ile eşleşmedi\n"
-
-#: ../web/swat.c:1048
-#, c-format
-msgid " The passwd for '%s' has been changed."
-msgstr " '%s' için şifre değiştirildi."
-
-#: ../web/swat.c:1051
-#, c-format
-msgid " The passwd for '%s' has NOT been changed."
-msgstr " '%s' için şifre DEĞİŞTİRİLMEDİ."
-
-#: ../web/swat.c:1076
-msgid "Server Password Management"
-msgstr "Sunucu Şifre Yönetimi"
-
-#.
-#. * Create all the dialog boxes for data collection
-#.
-#: ../web/swat.c:1085 ../web/swat.c:1132
-msgid "User Name"
-msgstr " Kullanıcı Adı"
-
-#: ../web/swat.c:1088 ../web/swat.c:1134
-msgid "Old Password"
-msgstr " Eski Şifre"
-
-#: ../web/swat.c:1091 ../web/swat.c:1136
-msgid "New Password"
-msgstr " Yeni Şifre"
-
-#: ../web/swat.c:1093 ../web/swat.c:1138
-msgid "Re-type New Password"
-msgstr " Yeni Şifre Tekrarı"
-
-#: ../web/swat.c:1101 ../web/swat.c:1149
-msgid "Change Password"
-msgstr "Şifre Değiştir"
-
-#: ../web/swat.c:1104
-msgid "Add New User"
-msgstr "Kull. Ekle"
-
-#: ../web/swat.c:1106
-msgid "Delete User"
-msgstr "Kull. Sil"
-
-#: ../web/swat.c:1108
-msgid "Disable User"
-msgstr "Kull. Etkisizleştir"
-
-#: ../web/swat.c:1110
-msgid "Enable User"
-msgstr "Kull. Etkinleştir"
-
-#: ../web/swat.c:1123
-msgid "Client/Server Password Management"
-msgstr "İstemci/Sunucu Şifre Yönetimi"
-
-#: ../web/swat.c:1140
-msgid "Remote Machine"
-msgstr " Uzak Makina"
-
-#: ../web/swat.c:1179
-msgid "Printer Parameters"
-msgstr "Yazıcı Bilgileri"
-
-#: ../web/swat.c:1181
-msgid "Important Note:"
-msgstr "Önemli Not:"
-
-#: ../web/swat.c:1182
-msgid "Printer names marked with [*] in the Choose Printer drop-down box "
-msgstr "Yazıcı Seç kutusunda [*] ile işaretlenmiş yazıcı isimleri "
-
-#: ../web/swat.c:1183
-msgid "are autoloaded printers from "
-msgstr "otomatik yüklenen yazıcılar "
-
-#: ../web/swat.c:1184
-msgid "Printcap Name"
-msgstr "Printcap Adı"
-
-#: ../web/swat.c:1185
-msgid "Attempting to delete these printers from SWAT will have no effect."
-msgstr "Bu yazıcıları SWAT'dan silmek etkisiz olacaktır.\n"
-
-#: ../web/swat.c:1231
-msgid "Choose Printer"
-msgstr "Yazıcı Seç"
-
-#: ../web/swat.c:1250
-msgid "Delete Printer"
-msgstr "Yazıcı Sil"
-
-#: ../web/swat.c:1257
-msgid "Create Printer"
-msgstr "Yazıcı Oluştur"
-
-#: ../web/statuspage.c:123
-msgid "RDONLY "
-msgstr "SALTOKUNUR "
-
-#: ../web/statuspage.c:124
-msgid "WRONLY "
-msgstr "SALTYAZILIR "
-
-#: ../web/statuspage.c:125
-msgid "RDWR "
-msgstr "O/Y "
-
-#: ../web/statuspage.c:309
-msgid "Server Status"
-msgstr "Sunucu Durumu"
-
-#: ../web/statuspage.c:314
-msgid "Auto Refresh"
-msgstr "Oto Tazele"
-
-#: ../web/statuspage.c:315 ../web/statuspage.c:320
-msgid "Refresh Interval: "
-msgstr "Tazeleme Aralığı: "
-
-#: ../web/statuspage.c:319
-msgid "Stop Refreshing"
-msgstr "Tazelemeyi Durdur"
-
-#: ../web/statuspage.c:334
-msgid "version:"
-msgstr "sürüm:"
-
-#: ../web/statuspage.c:337
-msgid "smbd:"
-msgstr "smbd:"
-
-#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
-msgid "running"
-msgstr "çalışıyor"
-
-#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
-msgid "not running"
-msgstr "çalışmıyor"
-
-#: ../web/statuspage.c:341
-msgid "Stop smbd"
-msgstr "Smbd'yi durdur"
-
-#: ../web/statuspage.c:343
-msgid "Start smbd"
-msgstr "Smbd'yi çalıştır"
-
-#: ../web/statuspage.c:345
-msgid "Restart smbd"
-msgstr "Smbd'yi yeniden çalıştır"
-
-#: ../web/statuspage.c:350
-msgid "nmbd:"
-msgstr "nmbd:"
-
-#: ../web/statuspage.c:354
-msgid "Stop nmbd"
-msgstr "Nmbd'yi durdur"
-
-#: ../web/statuspage.c:356
-msgid "Start nmbd"
-msgstr "Nmbd'yi çalıştır"
-
-#: ../web/statuspage.c:358
-msgid "Restart nmbd"
-msgstr "Nmbd'yi yeniden çalıştır"
-
-#: ../web/statuspage.c:364
-msgid "winbindd:"
-msgstr "winbind uid"
-
-#: ../web/statuspage.c:368
-msgid "Stop winbindd"
-msgstr "Nmbd'yi durdur"
-
-#: ../web/statuspage.c:370
-msgid "Start winbindd"
-msgstr "Nmbd'yi çalıştır"
-
-#: ../web/statuspage.c:372
-msgid "Restart winbindd"
-msgstr "Nmbd'yi yeniden çalıştır"
-
-#. stop, restart all
-#: ../web/statuspage.c:381
-msgid "Stop All"
-msgstr ""
-
-#: ../web/statuspage.c:382
-msgid "Restart All"
-msgstr "Nmbd'yi yeniden çalıştır"
-
-#. start all
-#: ../web/statuspage.c:386
-msgid "Start All"
-msgstr "Nmbd'yi çalıştır"
-
-#: ../web/statuspage.c:393
-msgid "Active Connections"
-msgstr "Aktif Bağlantılar"
-
-#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
-msgid "PID"
-msgstr "PID"
-
-#: ../web/statuspage.c:395 ../web/statuspage.c:408
-msgid "Client"
-msgstr "İstemci"
-
-#: ../web/statuspage.c:395
-msgid "IP address"
-msgstr "IP numarası"
-
-#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
-msgid "Date"
-msgstr "Tarih"
-
-#: ../web/statuspage.c:397
-msgid "Kill"
-msgstr "Kapat"
-
-#: ../web/statuspage.c:405
-msgid "Active Shares"
-msgstr "Aktif Paylaşımlar"
-
-#: ../web/statuspage.c:408
-msgid "Share"
-msgstr "Paylaşım"
-
-#: ../web/statuspage.c:408
-msgid "User"
-msgstr "Kullanıcı"
-
-#: ../web/statuspage.c:408
-msgid "Group"
-msgstr "Grup"
-
-#: ../web/statuspage.c:414
-msgid "Open Files"
-msgstr "Açık Dosyalar"
-
-#: ../web/statuspage.c:416
-msgid "Sharing"
-msgstr "Paylaşılıyor"
-
-#: ../web/statuspage.c:416
-msgid "R/W"
-msgstr "O/Y"
-
-#: ../web/statuspage.c:416
-msgid "Oplock"
-msgstr "Oplock"
-
-#: ../web/statuspage.c:416
-msgid "File"
-msgstr "Dosya"
-
-#: ../web/statuspage.c:425
-msgid "Show Client in col 1"
-msgstr ""
-
-#: ../web/statuspage.c:426
-msgid "Show PID in col 1"
-msgstr ""
-
-#: ../param/loadparm.c:755
-msgid "Base Options"
-msgstr "Temel Seçenekler"
-
-#: ../param/loadparm.c:775
-msgid "Security Options"
-msgstr "Güvenlik Seçenekleri"
-
-#: ../param/loadparm.c:859
-msgid "Logging Options"
-msgstr "Günlük Kaydı Seçenekleri"
-
-#: ../param/loadparm.c:874
-msgid "Protocol Options"
-msgstr "Protokol Seçenekleri"
-
-#: ../param/loadparm.c:911
-msgid "Tuning Options"
-msgstr "Ayar Seçenekleri"
-
-#: ../param/loadparm.c:940
-msgid "Printing Options"
-msgstr "Yazdırma Seçenekleri"
-
-#: ../param/loadparm.c:970
-msgid "Filename Handling"
-msgstr "Dosyaadı İşlenmesi"
-
-#: ../param/loadparm.c:996
-msgid "Domain Options"
-msgstr "Alan Seçenekleri"
-
-#: ../param/loadparm.c:1000
-msgid "Logon Options"
-msgstr "Sistem Giriş Seçenekleri"
-
-#: ../param/loadparm.c:1019
-msgid "Browse Options"
-msgstr "Gözatma Seçenekleri"
-
-#: ../param/loadparm.c:1033
-msgid "WINS Options"
-msgstr "WINS Seçenekleri"
-
-#: ../param/loadparm.c:1043
-msgid "Locking Options"
-msgstr "Kilitleme Seçenekleri"
-
-#: ../param/loadparm.c:1061
-msgid "Ldap Options"
-msgstr "Ldap Seçenekleri"
-
-#: ../param/loadparm.c:1078
-msgid "Miscellaneous Options"
-msgstr "Diğer Seçenekler"
-
-#: ../param/loadparm.c:1138
-msgid "VFS module options"
-msgstr "VFS Seçenekleri"
-
-#: ../param/loadparm.c:1148
-msgid "Winbind options"
-msgstr "Winbind seçenekleri"
diff --git a/source3/script/installmsg.sh b/source3/script/installmsg.sh
deleted file mode 100644
index 859e4c10cf..0000000000
--- a/source3/script/installmsg.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-# first version (Sept 2003) written by Shiro Yamada <shiro@miraclelinux.com>
-# based on the first verion (March 2002) of installdat.sh written by Herb Lewis
-
-DESTDIR=$1
-MSGDIR=`echo $2 | sed 's/\/\//\//g'`
-SRCDIR=$3/
-shift
-shift
-shift
-
-case $0 in
- *uninstall*)
- if test ! -d "$DESTDIR/$MSGDIR"; then
- echo "Directory $DESTDIR/$MSGDIR does not exist! "
- echo "Do a "make installmsg" or "make install" first. "
- exit 1
- fi
- mode='uninstall'
- ;;
- *) mode='install' ;;
-esac
-
-for f in $SRCDIR/po/*.msg; do
- FNAME="$DESTDIR/$MSGDIR/`basename $f`"
- if test "$mode" = 'install'; then
- echo "Installing $f as $FNAME "
- cp "$f" "$FNAME"
- if test ! -f "$FNAME"; then
- echo "Cannot install $FNAME. Does $USER have privileges? "
- exit 1
- fi
- chmod 0644 "$FNAME"
- elif test "$mode" = 'uninstall'; then
- echo "Removing $FNAME "
- rm -f "$FNAME"
- if test -f "$FNAME"; then
- echo "Cannot remove $FNAME. Does $USER have privileges? "
- exit 1
- fi
- else
- echo "Unknown mode, $mode. Script called as $0 "
- exit 1
- fi
-done
-
-if test "$mode" = 'install'; then
- cat << EOF
-==============================================================================
-The SWAT msg files have been installed. You may uninstall the msg files using
-the command "make uninstallmsg" or "make uninstall" to uninstall binaries, man
-pages, msg files, and shell scripts.
-==============================================================================
-EOF
-else
- cat << EOF
-=============================================================================
-The SWAT msg files have been removed. You may restore these files using the
-command "make installmsg" or "make install" to install binaries, man pages,
-modules, msg files, and shell scripts.
-======================================================================
-EOF
-fi
-
-exit 0
diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
deleted file mode 100755
index 40596f3bd8..0000000000
--- a/source3/script/installswat.sh
+++ /dev/null
@@ -1,296 +0,0 @@
-#!/bin/sh
-#first version March 1998, Andrew Tridgell
-
-DESTDIR=$1
-SWATDIR=`echo $2 | sed 's/\/\//\//g'`
-SRCDIR=$3/
-BOOKDIR="$DESTDIR/$SWATDIR/using_samba"
-
-case $0 in
- *uninstall*)
- echo "Removing SWAT from $DESTDIR/$SWATDIR "
- echo "Removing the Samba Web Administration Tool "
- printf "%s" "Removed "
- mode='uninstall'
- ;;
- *)
- echo "Installing SWAT in $DESTDIR/$SWATDIR "
- echo "Installing the Samba Web Administration Tool "
- printf "%s" "Installing "
- mode='install'
- ;;
-esac
-
-LANGS=". `cd $SRCDIR../swat/; /bin/echo lang/??`"
-echo "langs are `cd $SRCDIR../swat/lang/; /bin/echo ??` "
-
-if test "$mode" = 'install'; then
- for ln in $LANGS; do
- SWATLANGDIR="$DESTDIR/$SWATDIR/$ln"
- for d in $SWATLANGDIR $SWATLANGDIR/help $SWATLANGDIR/images \
- $SWATLANGDIR/include $SWATLANGDIR/js; do
- if [ ! -d $d ]; then
- mkdir -p $d
- if [ ! -d $d ]; then
- echo "Failed to make directory $d, does $USER have privileges? "
- exit 1
- fi
- fi
- done
- done
-fi
-
-for ln in $LANGS; do
-
- # images
- for f in $SRCDIR../swat/$ln/images/*.gif; do
- if [ ! -f $f ] ; then
- continue
- fi
- FNAME="$DESTDIR/$SWATDIR/$ln/images/`basename $f`"
- echo $FNAME
- if test "$mode" = 'install'; then
- cp "$f" "$FNAME"
- if test ! -f "$FNAME"; then
- echo "Cannot install $FNAME. Does $USER have privileges? "
- exit 1
- fi
- chmod 0644 "$FNAME"
- elif test "$mode" = 'uninstall'; then
- rm -f "$FNAME"
- if test -f "$FNAME"; then
- echo "Cannot remove $FNAME. Does $USER have privileges? "
- exit 1
- fi
- else
- echo "Unknown mode, $mode. Script called as $0 "
- exit 1
- fi
- done
-
- # html help
- for f in $SRCDIR../swat/$ln/help/*.html; do
- if [ ! -f $f ] ; then
- continue
- fi
- FNAME="$DESTDIR/$SWATDIR/$ln/help/`basename $f`"
- echo $FNAME
- if test "$mode" = 'install'; then
- if [ "x$BOOKDIR" = "x" ]; then
- cat $f | sed 's/@BOOKDIR@.*$//' > $FNAME.tmp
- else
- cat $f | sed 's/@BOOKDIR@//' > $FNAME.tmp
- fi
- if test ! -f "$FNAME.tmp"; then
- echo "Cannot install $FNAME. Does $USER have privileges? "
- exit 1
- fi
- f=$FNAME.tmp
- cp "$f" "$FNAME"
- rm -f "$f"
- if test ! -f "$FNAME"; then
- echo "Cannot install $FNAME. Does $USER have privileges? "
- exit 1
- fi
- chmod 0644 "$FNAME"
- elif test "$mode" = 'uninstall'; then
- rm -f "$FNAME"
- if test -f "$FNAME"; then
- echo "Cannot remove $FNAME. Does $USER have privileges? "
- exit 1
- fi
- fi
- done
-
- # "server-side" includes
- for f in $SRCDIR../swat/$ln/include/*; do
- if [ ! -f $f ] ; then
- continue
- fi
- FNAME="$DESTDIR/$SWATDIR/$ln/include/`basename $f`"
- echo $FNAME
- if test "$mode" = 'install'; then
- cp "$f" "$FNAME"
- if test ! -f "$FNAME"; then
- echo "Cannot install $FNAME. Does $USER have privileges? "
- exit 1
- fi
- chmod 0644 $FNAME
- elif test "$mode" = 'uninstall'; then
- rm -f "$FNAME"
- if test -f "$FNAME"; then
- echo "Cannot remove $FNAME. Does $USER have privileges? "
- exit 1
- fi
- fi
- done
-
-done
-
-# Install/ remove html documentation (if html documentation tree is here)
-
-if [ -d $SRCDIR../docs/htmldocs/ ]; then
-
- for dir in htmldocs/manpages htmldocs/Samba3-ByExample htmldocs/Samba3-Developers-Guide htmldocs/Samba3-HOWTO
- do
-
- if [ ! -d $SRCDIR../docs/$dir ]; then
- continue
- fi
-
- INSTALLDIR="$DESTDIR/$SWATDIR/help/`echo $dir | sed 's/htmldocs\///g'`"
- if test ! -d "$INSTALLDIR" -a "$mode" = 'install'; then
- mkdir "$INSTALLDIR"
- if test ! -d "$INSTALLDIR"; then
- echo "Failed to make directory $INSTALLDIR, does $USER have privileges? "
- exit 1
- fi
- fi
-
- for f in $SRCDIR../docs/$dir/*.html; do
- FNAME=$INSTALLDIR/`basename $f`
- echo $FNAME
- if test "$mode" = 'install'; then
- cp "$f" "$FNAME"
- if test ! -f "$FNAME"; then
- echo "Cannot install $FNAME. Does $USER have privileges? "
- exit 1
- fi
- chmod 0644 $FNAME
- elif test "$mode" = 'uninstall'; then
- rm -f "$FNAME"
- if test -f "$FNAME"; then
- echo "Cannot remove $FNAME. Does $USER have privileges? "
- exit 1
- fi
- fi
- done
-
- if test -d "$SRCDIR../docs/$dir/images/"; then
- if test ! -d "$INSTALLDIR/images/" -a "$mode" = 'install'; then
- mkdir "$INSTALLDIR/images"
- if test ! -d "$INSTALLDIR/images/"; then
- echo "Failed to make directory $INSTALLDIR/images, does $USER have privileges? "
- exit 1
- fi
- fi
- for f in $SRCDIR../docs/$dir/images/*.png; do
- FNAME=$INSTALLDIR/images/`basename $f`
- echo $FNAME
- if test "$mode" = 'install'; then
- cp "$f" "$FNAME"
- if test ! -f "$FNAME"; then
- echo "Cannot install $FNAME. Does $USER have privileges? "
- exit 1
- fi
- chmod 0644 $FNAME
- elif test "$mode" = 'uninstall'; then
- rm -f "$FNAME"
- if test -f "$FNAME"; then
- echo "Cannot remove $FNAME. Does $USER have privileges? "
- exit 1
- fi
- fi
- done
- fi
- done
-fi
-
-# Install/ remove Using Samba book (but only if it is there)
-
-if [ "x$BOOKDIR" != "x" -a -f $SRCDIR../docs/htmldocs/using_samba/toc.html ]; then
-
- # Create directories
-
- for d in $BOOKDIR $BOOKDIR/figs ; do
- if test ! -d "$d" -a "$mode" = 'install'; then
- mkdir $d
- if test ! -d "$d"; then
- echo "Failed to make directory $d, does $USER have privileges? "
- exit 1
- fi
- fi
- done
-
- # HTML files
-
- for f in $SRCDIR../docs/htmldocs/using_samba/*.html; do
- FNAME=$BOOKDIR/`basename $f`
- echo $FNAME
- if test "$mode" = 'install'; then
- cp "$f" "$FNAME"
- if test ! -f "$FNAME"; then
- echo "Cannot install $FNAME. Does $USER have privileges? "
- exit 1
- fi
- chmod 0644 $FNAME
- elif test "$mode" = 'uninstall'; then
- rm -f "$FNAME"
- if test -f "$FNAME"; then
- echo "Cannot remove $FNAME. Does $USER have privileges? "
- exit 1
- fi
- fi
- done
-
- for f in $SRCDIR../docs/htmldocs/using_samba/*.gif; do
- FNAME=$BOOKDIR/`basename $f`
- echo $FNAME
- if test "$mode" = 'install'; then
- cp "$f" "$FNAME"
- if test ! -f "$FNAME"; then
- echo "Cannot install $FNAME. Does $USER have privileges? "
- exit 1
- fi
- chmod 0644 $FNAME
- elif test "$mode" = 'uninstall'; then
- rm -f "$FNAME"
- if test -f "$FNAME"; then
- echo "Cannot remove $FNAME. Does $USER have privileges? "
- exit 1
- fi
- fi
- done
-
- # Figures
-
- for f in $SRCDIR../docs/htmldocs/using_samba/figs/*.gif; do
- FNAME=$BOOKDIR/figs/`basename $f`
- echo $FNAME
- if test "$mode" = 'install'; then
- cp "$f" "$FNAME"
- if test ! -f "$FNAME"; then
- echo "Cannot install $FNAME. Does $USER have privileges? "
- exit 1
- fi
- chmod 0644 $FNAME
- elif test "$mode" = 'uninstall'; then
- rm -f "$FNAME"
- if test -f "$FNAME"; then
- echo "Cannot remove $FNAME. Does $USER have privileges? "
- exit 1
- fi
- fi
- done
-
-fi
-
-if test "$mode" = 'install'; then
- cat << EOF
-======================================================================
-The SWAT files have been installed. Remember to read the documentation
-for information on enabling and using SWAT
-======================================================================
-EOF
-else
- cat << EOF
-======================================================================
-The SWAT files have been removed. You may restore these files using
-the command "make installswat" or "make install" to install binaries,
-man pages, modules, SWAT, and shell scripts.
-======================================================================
-EOF
-fi
-
-exit 0
-
diff --git a/source3/script/mkbuildoptions.awk b/source3/script/mkbuildoptions.awk
index 122489edd3..1a32d7af6b 100644
--- a/source3/script/mkbuildoptions.awk
+++ b/source3/script/mkbuildoptions.awk
@@ -79,7 +79,6 @@ BEGIN {
print " output(screen,\" SBINDIR: %s\\n\", get_dyn_SBINDIR());";
print " output(screen,\" BINDIR: %s\\n\", get_dyn_BINDIR());";
- print " output(screen,\" SWATDIR: %s\\n\", get_dyn_SWATDIR());";
print " output(screen,\" CONFIGFILE: %s\\n\", get_dyn_CONFIGFILE());";
print " output(screen,\" LOGFILEBASE: %s\\n\", get_dyn_LOGFILEBASE());";
diff --git a/source3/web/cgi.c b/source3/web/cgi.c
deleted file mode 100644
index b97ed2578c..0000000000
--- a/source3/web/cgi.c
+++ /dev/null
@@ -1,798 +0,0 @@
-/*
- some simple CGI helper routines
- Copyright (C) Andrew Tridgell 1997-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 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/>.
-*/
-
-
-#include "includes.h"
-#include "system/passwd.h"
-#include "system/filesys.h"
-#include "web/swat_proto.h"
-#include "intl/lang_tdb.h"
-#include "auth.h"
-#include "secrets.h"
-#include "../lib/util/setid.h"
-
-#define MAX_VARIABLES 10000
-
-/* set the expiry on fixed pages */
-#define EXPIRY_TIME (60*60*24*7)
-
-#ifdef DEBUG_COMMENTS
-extern void print_title(char *fmt, ...);
-#endif
-
-struct cgi_var {
- char *name;
- char *value;
-};
-
-static struct cgi_var variables[MAX_VARIABLES];
-static int num_variables;
-static int content_length;
-static int request_post;
-static char *query_string;
-static const char *baseurl;
-static char *pathinfo;
-static char *C_user;
-static char *C_pass;
-static bool inetd_server;
-static bool got_request;
-
-static char *grab_line(FILE *f, int *cl)
-{
- char *ret = NULL;
- int i = 0;
- int len = 0;
-
- while ((*cl)) {
- int c;
-
- if (i == len) {
- char *ret2;
- if (len == 0) len = 1024;
- else len *= 2;
- ret2 = (char *)SMB_REALLOC_KEEP_OLD_ON_ERROR(ret, len);
- if (!ret2) return ret;
- ret = ret2;
- }
-
- c = fgetc(f);
- (*cl)--;
-
- if (c == EOF) {
- (*cl) = 0;
- break;
- }
-
- if (c == '\r') continue;
-
- if (strchr_m("\n&", c)) break;
-
- ret[i++] = c;
-
- }
-
- if (ret) {
- ret[i] = 0;
- }
- return ret;
-}
-
-/**
- URL encoded strings can have a '+', which should be replaced with a space
-
- (This was in rfc1738_unescape(), but that broke the squid helper)
-**/
-
-static void plus_to_space_unescape(char *buf)
-{
- char *p=buf;
-
- while ((p=strchr_m(p,'+')))
- *p = ' ';
-}
-
-/***************************************************************************
- load all the variables passed to the CGI program. May have multiple variables
- with the same name and the same or different values. Takes a file parameter
- for simulating CGI invocation eg loading saved preferences.
- ***************************************************************************/
-void cgi_load_variables(void)
-{
- static char *line;
- char *p, *s, *tok;
- int len, i;
- FILE *f = stdin;
-
-#ifdef DEBUG_COMMENTS
- char dummy[100]="";
- print_title(dummy);
- printf("<!== Start dump in cgi_load_variables() %s ==>\n",__FILE__);
-#endif
-
- if (!content_length) {
- p = getenv("CONTENT_LENGTH");
- len = p?atoi(p):0;
- } else {
- len = content_length;
- }
-
-
- if (len > 0 &&
- (request_post ||
- ((s=getenv("REQUEST_METHOD")) &&
- strequal(s,"POST")))) {
- while (len && (line=grab_line(f, &len))) {
- p = strchr_m(line,'=');
- if (!p) continue;
-
- *p = 0;
-
- variables[num_variables].name = SMB_STRDUP(line);
- variables[num_variables].value = SMB_STRDUP(p+1);
-
- SAFE_FREE(line);
-
- if (!variables[num_variables].name ||
- !variables[num_variables].value)
- continue;
-
- plus_to_space_unescape(variables[num_variables].value);
- rfc1738_unescape(variables[num_variables].value);
- plus_to_space_unescape(variables[num_variables].name);
- rfc1738_unescape(variables[num_variables].name);
-
-#ifdef DEBUG_COMMENTS
- printf("<!== POST var %s has value \"%s\" ==>\n",
- variables[num_variables].name,
- variables[num_variables].value);
-#endif
-
- num_variables++;
- if (num_variables == MAX_VARIABLES) break;
- }
- }
-
- fclose(stdin);
- open("/dev/null", O_RDWR);
-
- if ((s=query_string) || (s=getenv("QUERY_STRING"))) {
- char *saveptr;
- for (tok=strtok_r(s, "&;", &saveptr); tok;
- tok=strtok_r(NULL, "&;", &saveptr)) {
- p = strchr_m(tok,'=');
- if (!p) continue;
-
- *p = 0;
-
- variables[num_variables].name = SMB_STRDUP(tok);
- variables[num_variables].value = SMB_STRDUP(p+1);
-
- if (!variables[num_variables].name ||
- !variables[num_variables].value)
- continue;
-
- plus_to_space_unescape(variables[num_variables].value);
- rfc1738_unescape(variables[num_variables].value);
- plus_to_space_unescape(variables[num_variables].name);
- rfc1738_unescape(variables[num_variables].name);
-
-#ifdef DEBUG_COMMENTS
- printf("<!== Commandline var %s has value \"%s\" ==>\n",
- variables[num_variables].name,
- variables[num_variables].value);
-#endif
- num_variables++;
- if (num_variables == MAX_VARIABLES) break;
- }
-
- }
-#ifdef DEBUG_COMMENTS
- printf("<!== End dump in cgi_load_variables() ==>\n");
-#endif
-
- /* variables from the client are in UTF-8 - convert them
- to our internal unix charset before use */
- for (i=0;i<num_variables;i++) {
- TALLOC_CTX *frame = talloc_stackframe();
- char *dest = NULL;
- size_t dest_len;
-
- convert_string_talloc(frame, CH_UTF8, CH_UNIX,
- variables[i].name, strlen(variables[i].name),
- &dest, &dest_len);
- SAFE_FREE(variables[i].name);
- variables[i].name = SMB_STRDUP(dest ? dest : "");
-
- dest = NULL;
- convert_string_talloc(frame, CH_UTF8, CH_UNIX,
- variables[i].value, strlen(variables[i].value),
- &dest, &dest_len);
- SAFE_FREE(variables[i].value);
- variables[i].value = SMB_STRDUP(dest ? dest : "");
- TALLOC_FREE(frame);
- }
-}
-
-
-/***************************************************************************
- find a variable passed via CGI
- Doesn't quite do what you think in the case of POST text variables, because
- if they exist they might have a value of "" or even " ", depending on the
- browser. Also doesn't allow for variables[] containing multiple variables
- with the same name and the same or different values.
- ***************************************************************************/
-
-const char *cgi_variable(const char *name)
-{
- int i;
-
- for (i=0;i<num_variables;i++)
- if (strcmp(variables[i].name, name) == 0)
- return variables[i].value;
- return NULL;
-}
-
-/***************************************************************************
- Version of the above that can't return a NULL pointer.
-***************************************************************************/
-
-const char *cgi_variable_nonull(const char *name)
-{
- const char *var = cgi_variable(name);
- if (var) {
- return var;
- } else {
- return "";
- }
-}
-
-/***************************************************************************
-tell a browser about a fatal error in the http processing
- ***************************************************************************/
-static void cgi_setup_error(const char *err, const char *header, const char *info)
-{
- if (!got_request) {
- /* damn browsers don't like getting cut off before they give a request */
- char line[1024];
- while (fgets(line, sizeof(line)-1, stdin)) {
- if (strnequal(line,"GET ", 4) ||
- strnequal(line,"POST ", 5) ||
- strnequal(line,"PUT ", 4)) {
- break;
- }
- }
- }
-
- printf("HTTP/1.0 %s\r\n%sConnection: close\r\nContent-Type: text/html\r\n\r\n<HTML><HEAD><TITLE>%s</TITLE></HEAD><BODY><H1>%s</H1>%s<p></BODY></HTML>\r\n\r\n", err, header, err, err, info);
- fclose(stdin);
- fclose(stdout);
- exit(0);
-}
-
-
-/***************************************************************************
-tell a browser about a fatal authentication error
- ***************************************************************************/
-static void cgi_auth_error(void)
-{
- if (inetd_server) {
- cgi_setup_error("401 Authorization Required",
- "WWW-Authenticate: Basic realm=\"SWAT\"\r\n",
- "You must be authenticated to use this service");
- } else {
- printf("Content-Type: text/html\r\n");
-
- printf("\r\n<HTML><HEAD><TITLE>SWAT</TITLE></HEAD>\n");
- printf("<BODY><H1>Installation Error</H1>\n");
- printf("SWAT must be installed via inetd. It cannot be run as a CGI script<p>\n");
- printf("</BODY></HTML>\r\n");
- }
- exit(0);
-}
-
-/***************************************************************************
-authenticate when we are running as a CGI
- ***************************************************************************/
-static void cgi_web_auth(void)
-{
- const char *user = getenv("REMOTE_USER");
- struct passwd *pwd;
- const char *head = "Content-Type: text/html\r\n\r\n<HTML><BODY><H1>SWAT installation Error</H1>\n";
- const char *tail = "</BODY></HTML>\r\n";
-
- if (!user) {
- printf("%sREMOTE_USER not set. Not authenticated by web server.<br>%s\n",
- head, tail);
- exit(0);
- }
-
- pwd = Get_Pwnam_alloc(talloc_tos(), user);
- if (!pwd) {
- printf("%sCannot find user %s<br>%s\n", head, user, tail);
- exit(0);
- }
-
- C_user = SMB_STRDUP(user);
-
- if (!samba_setuid(0)) {
- C_pass = secrets_fetch_generic("root", "SWAT");
- if (C_pass == NULL) {
- char *tmp_pass = NULL;
- tmp_pass = generate_random_password(talloc_tos(),
- 16, 16);
- if (tmp_pass == NULL) {
- printf("%sFailed to create random nonce for "
- "SWAT session\n<br>%s\n", head, tail);
- exit(0);
- }
- secrets_store_generic("root", "SWAT", tmp_pass);
- C_pass = SMB_STRDUP(tmp_pass);
- TALLOC_FREE(tmp_pass);
- }
- }
- samba_setuid(pwd->pw_uid);
- if (geteuid() != pwd->pw_uid || getuid() != pwd->pw_uid) {
- printf("%sFailed to become user %s - uid=%d/%d<br>%s\n",
- head, user, (int)geteuid(), (int)getuid(), tail);
- exit(0);
- }
- TALLOC_FREE(pwd);
-}
-
-
-/***************************************************************************
-handle a http authentication line
- ***************************************************************************/
-static bool cgi_handle_authorization(char *line)
-{
- char *p;
- fstring user, user_pass;
- struct passwd *pass = NULL;
- const char *rhost;
- char addr[INET6_ADDRSTRLEN];
- size_t size = 0;
-
- if (!strnequal(line,"Basic ", 6)) {
- goto err;
- }
- line += 6;
- while (line[0] == ' ') line++;
- base64_decode_inplace(line);
- if (!(p=strchr_m(line,':'))) {
- /*
- * Always give the same error so a cracker
- * cannot tell why we fail.
- */
- goto err;
- }
- *p = 0;
-
- if (!convert_string(CH_UTF8, CH_UNIX,
- line, -1,
- user, sizeof(user), &size)) {
- goto err;
- }
-
- if (!convert_string(CH_UTF8, CH_UNIX,
- p+1, -1,
- user_pass, sizeof(user_pass), &size)) {
- goto err;
- }
-
- /*
- * Try and get the user from the UNIX password file.
- */
-
- pass = Get_Pwnam_alloc(talloc_tos(), user);
-
- rhost = client_name(1);
- if (strequal(rhost,"UNKNOWN"))
- rhost = client_addr(1, addr, sizeof(addr));
-
- /*
- * Validate the password they have given.
- */
-
- if NT_STATUS_IS_OK(pass_check(pass, user, rhost, user_pass, false)) {
- if (pass) {
- /*
- * Password was ok.
- */
-
- if ( initgroups(pass->pw_name, pass->pw_gid) != 0 )
- goto err;
-
- become_user_permanently(pass->pw_uid, pass->pw_gid);
-
- /* Save the users name */
- C_user = SMB_STRDUP(user);
- C_pass = SMB_STRDUP(user_pass);
- TALLOC_FREE(pass);
- return True;
- }
- }
-
-err:
- cgi_setup_error("401 Bad Authorization",
- "WWW-Authenticate: Basic realm=\"SWAT\"\r\n",
- "username or password incorrect");
-
- TALLOC_FREE(pass);
- return False;
-}
-
-/***************************************************************************
-is this root?
- ***************************************************************************/
-bool am_root(void)
-{
- if (geteuid() == 0) {
- return( True);
- } else {
- return( False);
- }
-}
-
-/***************************************************************************
-return a ptr to the users name
- ***************************************************************************/
-char *cgi_user_name(void)
-{
- return(C_user);
-}
-
-/***************************************************************************
-return a ptr to the users password
- ***************************************************************************/
-char *cgi_user_pass(void)
-{
- return(C_pass);
-}
-
-/***************************************************************************
-handle a file download
- ***************************************************************************/
-static void cgi_download(char *file)
-{
- SMB_STRUCT_STAT st;
- char buf[1024];
- int fd, l, i;
- char *p;
- char *lang;
-
- /* sanitise the filename */
- for (i=0;file[i];i++) {
- if (!isalnum((int)file[i]) && !strchr_m("/.-_", file[i])) {
- cgi_setup_error("404 File Not Found","",
- "Illegal character in filename");
- }
- }
-
- if (sys_stat(file, &st, false) != 0) {
- cgi_setup_error("404 File Not Found","",
- "The requested file was not found");
- }
-
- if (S_ISDIR(st.st_ex_mode))
- {
- snprintf(buf, sizeof(buf), "%s/index.html", file);
- if (!file_exist_stat(buf, &st, false)
- || !S_ISREG(st.st_ex_mode))
- {
- cgi_setup_error("404 File Not Found","",
- "The requested file was not found");
- }
- }
- else if (S_ISREG(st.st_ex_mode))
- {
- snprintf(buf, sizeof(buf), "%s", file);
- }
- else
- {
- cgi_setup_error("404 File Not Found","",
- "The requested file was not found");
- }
-
- fd = web_open(buf,O_RDONLY,0);
- if (fd == -1) {
- cgi_setup_error("404 File Not Found","",
- "The requested file was not found");
- }
- printf("HTTP/1.0 200 OK\r\n");
- if ((p=strrchr_m(buf, '.'))) {
- if (strcmp(p,".gif")==0) {
- printf("Content-Type: image/gif\r\n");
- } else if (strcmp(p,".jpg")==0) {
- printf("Content-Type: image/jpeg\r\n");
- } else if (strcmp(p,".png")==0) {
- printf("Content-Type: image/png\r\n");
- } else if (strcmp(p,".css")==0) {
- printf("Content-Type: text/css\r\n");
- } else if (strcmp(p,".txt")==0) {
- printf("Content-Type: text/plain\r\n");
- } else {
- printf("Content-Type: text/html\r\n");
- }
- }
- printf("Expires: %s\r\n",
- http_timestring(talloc_tos(), time(NULL)+EXPIRY_TIME));
-
- lang = lang_tdb_current();
- if (lang) {
- printf("Content-Language: %s\r\n", lang);
- }
-
- printf("Content-Length: %d\r\n\r\n", (int)st.st_ex_size);
- while ((l=read(fd,buf,sizeof(buf)))>0) {
- if (fwrite(buf, 1, l, stdout) != l) {
- break;
- }
- }
- close(fd);
- exit(0);
-}
-
-
-
-/* return true if the char* contains ip addrs only. Used to avoid
-name lookup calls */
-
-static bool only_ipaddrs_in_list(const char **list)
-{
- bool only_ip = true;
-
- if (!list) {
- return true;
- }
-
- for (; *list ; list++) {
- /* factor out the special strings */
- if (strequal(*list, "ALL") || strequal(*list, "FAIL") ||
- strequal(*list, "EXCEPT")) {
- continue;
- }
-
- if (!is_ipaddress(*list)) {
- /*
- * If we failed, make sure that it was not because
- * the token was a network/netmask pair. Only
- * network/netmask pairs have a '/' in them.
- */
- if ((strchr_m(*list, '/')) == NULL) {
- only_ip = false;
- DEBUG(3,("only_ipaddrs_in_list: list has "
- "non-ip address (%s)\n",
- *list));
- break;
- }
- }
- }
-
- return only_ip;
-}
-
-/* return true if access should be allowed to a service for a socket */
-static bool check_access(int sock, const char **allow_list,
- const char **deny_list)
-{
- bool ret = false;
- bool only_ip = false;
- char addr[INET6_ADDRSTRLEN];
-
- if ((!deny_list || *deny_list==0) && (!allow_list || *allow_list==0)) {
- return true;
- }
-
- /* Bypass name resolution calls if the lists
- * only contain IP addrs */
- if (only_ipaddrs_in_list(allow_list) &&
- only_ipaddrs_in_list(deny_list)) {
- only_ip = true;
- DEBUG (3, ("check_access: no hostnames "
- "in host allow/deny list.\n"));
- ret = allow_access(deny_list,
- allow_list,
- "",
- get_peer_addr(sock,addr,sizeof(addr)));
- } else {
- DEBUG (3, ("check_access: hostnames in "
- "host allow/deny list.\n"));
- ret = allow_access(deny_list,
- allow_list,
- get_peer_name(sock,true),
- get_peer_addr(sock,addr,sizeof(addr)));
- }
-
- if (ret) {
- DEBUG(2,("Allowed connection from %s (%s)\n",
- only_ip ? "" : get_peer_name(sock,true),
- get_peer_addr(sock,addr,sizeof(addr))));
- } else {
- DEBUG(0,("Denied connection from %s (%s)\n",
- only_ip ? "" : get_peer_name(sock,true),
- get_peer_addr(sock,addr,sizeof(addr))));
- }
-
- return(ret);
-}
-
-/**
- * @brief Setup the CGI framework.
- *
- * Setup the cgi framework, handling the possibility that this program
- * is either run as a true CGI program with a gateway to a web server, or
- * is itself a mini web server.
- **/
-void cgi_setup(const char *rootdir, int auth_required)
-{
- bool authenticated = False;
- char line[1024];
- char *url=NULL;
- char *p;
- char *lang;
-
- if (chdir(rootdir)) {
- cgi_setup_error("500 Server Error", "",
- "chdir failed - the server is not configured correctly");
- }
-
- /* Handle the possibility we might be running as non-root */
- sec_init();
-
- if ((lang=getenv("HTTP_ACCEPT_LANGUAGE"))) {
- /* if running as a cgi program */
- web_set_lang(lang);
- }
-
- /* maybe we are running under a web server */
- if (getenv("CONTENT_LENGTH") || getenv("REQUEST_METHOD")) {
- if (auth_required) {
- cgi_web_auth();
- }
- return;
- }
-
- inetd_server = True;
-
- if (!check_access(1, lp_hostsallow(-1), lp_hostsdeny(-1))) {
- cgi_setup_error("403 Forbidden", "",
- "Samba is configured to deny access from this client\n<br>Check your \"hosts allow\" and \"hosts deny\" options in smb.conf ");
- }
-
- /* we are a mini-web server. We need to read the request from stdin
- and handle authentication etc */
- while (fgets(line, sizeof(line)-1, stdin)) {
- if (line[0] == '\r' || line[0] == '\n') break;
- if (strnequal(line,"GET ", 4)) {
- got_request = True;
- url = SMB_STRDUP(&line[4]);
- } else if (strnequal(line,"POST ", 5)) {
- got_request = True;
- request_post = 1;
- url = SMB_STRDUP(&line[5]);
- } else if (strnequal(line,"PUT ", 4)) {
- got_request = True;
- cgi_setup_error("400 Bad Request", "",
- "This server does not accept PUT requests");
- } else if (strnequal(line,"Authorization: ", 15)) {
- authenticated = cgi_handle_authorization(&line[15]);
- } else if (strnequal(line,"Content-Length: ", 16)) {
- content_length = atoi(&line[16]);
- } else if (strnequal(line,"Accept-Language: ", 17)) {
- web_set_lang(&line[17]);
- }
- /* ignore all other requests! */
- }
-
- if (auth_required && !authenticated) {
- cgi_auth_error();
- }
-
- if (!url) {
- cgi_setup_error("400 Bad Request", "",
- "You must specify a GET or POST request");
- }
-
- /* trim the URL */
- if ((p = strchr_m(url,' ')) || (p=strchr_m(url,'\t'))) {
- *p = 0;
- }
- while (*url && strchr_m("\r\n",url[strlen(url)-1])) {
- url[strlen(url)-1] = 0;
- }
-
- /* anything following a ? in the URL is part of the query string */
- if ((p=strchr_m(url,'?'))) {
- query_string = p+1;
- *p = 0;
- }
-
- string_sub(url, "/swat/", "", 0);
-
- if (url[0] != '/' && strstr(url,"..")==0) {
- cgi_download(url);
- }
-
- printf("HTTP/1.0 200 OK\r\nConnection: close\r\n");
- printf("Date: %s\r\n", http_timestring(talloc_tos(), time(NULL)));
- baseurl = "";
- pathinfo = url+1;
-}
-
-
-/***************************************************************************
-return the current pages URL
- ***************************************************************************/
-const char *cgi_baseurl(void)
-{
- if (inetd_server) {
- return baseurl;
- }
- return getenv("SCRIPT_NAME");
-}
-
-/***************************************************************************
-return the current pages path info
- ***************************************************************************/
-const char *cgi_pathinfo(void)
-{
- char *r;
- if (inetd_server) {
- return pathinfo;
- }
- r = getenv("PATH_INFO");
- if (!r) return "";
- if (*r == '/') r++;
- return r;
-}
-
-/***************************************************************************
-return the hostname of the client
- ***************************************************************************/
-const char *cgi_remote_host(void)
-{
- if (inetd_server) {
- return get_peer_name(1,False);
- }
- return getenv("REMOTE_HOST");
-}
-
-/***************************************************************************
-return the hostname of the client
- ***************************************************************************/
-const char *cgi_remote_addr(void)
-{
- if (inetd_server) {
- char addr[INET6_ADDRSTRLEN];
- get_peer_addr(1,addr,sizeof(addr));
- return talloc_strdup(talloc_tos(), addr);
- }
- return getenv("REMOTE_ADDR");
-}
-
-
-/***************************************************************************
-return True if the request was a POST
- ***************************************************************************/
-bool cgi_waspost(void)
-{
- if (inetd_server) {
- return request_post;
- }
- return strequal(getenv("REQUEST_METHOD"), "POST");
-}
diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
deleted file mode 100644
index 955ff89b99..0000000000
--- a/source3/web/diagnose.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- diagnosis tools for web admin
- 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 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/>.
-*/
-
-#include "includes.h"
-#include "web/swat_proto.h"
-#include "lib/winbind_util.h"
-#include "libsmb/libsmb.h"
-
-#ifdef WITH_WINBIND
-
-/* check to see if winbind is running by pinging it */
-
-bool winbindd_running(void)
-{
- return winbind_ping();
-}
-#endif
-
-/* check to see if nmbd is running on localhost by looking for a __SAMBA__
- response */
-bool nmbd_running(void)
-{
- struct in_addr loopback_ip;
- int count;
- struct sockaddr_storage *ss_list;
- struct sockaddr_storage ss;
- NTSTATUS status;
-
- loopback_ip.s_addr = htonl(INADDR_LOOPBACK);
- in_addr_to_sockaddr_storage(&ss, loopback_ip);
-
- status = name_query("__SAMBA__", 0,
- True, True, &ss,
- talloc_tos(), &ss_list, &count,
- NULL);
- if (NT_STATUS_IS_OK(status)) {
- TALLOC_FREE(ss_list);
- return True;
- }
-
- return False;
-}
-
-
-/* check to see if smbd is running on localhost by trying to open a connection
- then closing it */
-bool smbd_running(void)
-{
- struct in_addr loopback_ip;
- NTSTATUS status;
- struct cli_state *cli;
- struct sockaddr_storage ss;
-
- loopback_ip.s_addr = htonl(INADDR_LOOPBACK);
- in_addr_to_sockaddr_storage(&ss, loopback_ip);
-
- status = cli_connect_nb("localhost", &ss, 0, 0x20, lp_netbios_name(),
- SMB_SIGNING_DEFAULT, 0, &cli);
- if (!NT_STATUS_IS_OK(status)) {
- return false;
- }
- cli_shutdown(cli);
- return True;
-}
diff --git a/source3/web/neg_lang.c b/source3/web/neg_lang.c
deleted file mode 100644
index c415449d09..0000000000
--- a/source3/web/neg_lang.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- SWAT language handling
-
- 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/>.
-
- Created by Ryo Kawahara <rkawa@lbe.co.jp>
-*/
-
-#include "includes.h"
-#include "web/swat_proto.h"
-#include "intl/lang_tdb.h"
-#include "system/filesys.h"
-
-/*
- during a file download we first check to see if there is a language
- specific file available. If there is then use that, otherwise
- just open the specified file
-*/
-int web_open(const char *fname, int flags, mode_t mode)
-{
- char *p = NULL;
- char *lang = lang_tdb_current();
- int fd;
- if (lang) {
- if (asprintf(&p, "lang/%s/%s", lang, fname) != -1) {
- fd = open(p, flags, mode);
- free(p);
- if (fd != -1) {
- return fd;
- }
- }
- }
-
- /* fall through to default name */
- return open(fname, flags, mode);
-}
-
-
-struct pri_list {
- float pri;
- char *string;
-};
-
-static int qsort_cmp_list(struct pri_list *a, struct pri_list *b)
-{
- if (a->pri > b->pri) return -1;
- if (a->pri < b->pri) return 1;
- return 0;
-}
-
-/*
- choose from a list of languages. The list can be comma or space
- separated
- Keep choosing until we get a hit
- Changed to habdle priority -- Simo
-*/
-
-void web_set_lang(const char *lang_string)
-{
- char **lang_list, **count;
- struct pri_list *pl;
- int lang_num, i;
-
- /* build the lang list */
- lang_list = str_list_make_v3(talloc_tos(), lang_string, ", \t\r\n");
- if (!lang_list) return;
-
- /* sort the list by priority */
- lang_num = 0;
- count = lang_list;
- while (*count && **count) {
- count++;
- lang_num++;
- }
- pl = SMB_MALLOC_ARRAY(struct pri_list, lang_num);
- if (!pl) {
- return;
- }
-
- for (i = 0; i < lang_num; i++) {
- char *pri_code;
- if ((pri_code=strstr(lang_list[i], ";q="))) {
- *pri_code = '\0';
- pri_code += 3;
- sscanf(pri_code, "%f", &(pl[i].pri));
- } else {
- pl[i].pri = 1;
- }
- pl[i].string = SMB_STRDUP(lang_list[i]);
- }
- TALLOC_FREE(lang_list);
-
- TYPESAFE_QSORT(pl, lang_num, qsort_cmp_list);
-
- /* it's not an error to not initialise - we just fall back to
- the default */
-
- for (i = 0; i < lang_num; i++) {
- if (lang_tdb_init(pl[i].string)) break;
- }
-
- for (i = 0; i < lang_num; i++) {
- SAFE_FREE(pl[i].string);
- }
- SAFE_FREE(pl);
-
- return;
-}
diff --git a/source3/web/startstop.c b/source3/web/startstop.c
deleted file mode 100644
index ec8f802ae9..0000000000
--- a/source3/web/startstop.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- start/stop nmbd and smbd
- 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 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/>.
-*/
-
-#include "includes.h"
-#include "web/swat_proto.h"
-#include "dynconfig/dynconfig.h"
-#include "../lib/util/pidfile.h"
-
-/** Startup smbd from web interface. */
-void start_smbd(void)
-{
- char *binfile = NULL;
-
- if (geteuid() != 0) {
- return;
- }
-
- if (fork()) {
- return;
- }
-
- if (asprintf(&binfile, "%s/smbd", get_dyn_SBINDIR()) > 0) {
- become_daemon(true, false, false);
- execl(binfile, binfile, "-D", NULL);
- }
- exit(0);
-}
-
-/* startup nmbd */
-void start_nmbd(void)
-{
- char *binfile = NULL;
-
- if (geteuid() != 0) {
- return;
- }
-
- if (fork()) {
- return;
- }
-
- if (asprintf(&binfile, "%s/nmbd", get_dyn_SBINDIR()) > 0) {
- become_daemon(true, false, false);
- execl(binfile, binfile, "-D", NULL);
- }
- exit(0);
-}
-
-/** Startup winbindd from web interface. */
-void start_winbindd(void)
-{
- char *binfile = NULL;
-
- if (geteuid() != 0) {
- return;
- }
-
- if (fork()) {
- return;
- }
-
- if (asprintf(&binfile, "%s/winbindd", get_dyn_SBINDIR()) > 0) {
- become_daemon(true, false, false);
- execl(binfile, binfile, NULL);
- }
- exit(0);
-}
-
-
-/* stop smbd */
-void stop_smbd(void)
-{
- pid_t pid = pidfile_pid(lp_piddir(), "smbd");
-
- if (geteuid() != 0) return;
-
- if (pid <= 0) return;
-
- kill(pid, SIGTERM);
-}
-
-/* stop nmbd */
-void stop_nmbd(void)
-{
- pid_t pid = pidfile_pid(lp_piddir(), "nmbd");
-
- if (geteuid() != 0) return;
-
- if (pid <= 0) return;
-
- kill(pid, SIGTERM);
-}
-#ifdef WITH_WINBIND
-/* stop winbindd */
-void stop_winbindd(void)
-{
- pid_t pid = pidfile_pid(lp_piddir(), "winbindd");
-
- if (geteuid() != 0) return;
-
- if (pid <= 0) return;
-
- kill(pid, SIGTERM);
-}
-#endif
-/* kill a specified process */
-void kill_pid(struct server_id pid)
-{
- if (geteuid() != 0) return;
-
- if (procid_to_pid(&pid) <= 0) return;
-
- kill(procid_to_pid(&pid), SIGTERM);
-}
diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
deleted file mode 100644
index d257970643..0000000000
--- a/source3/web/statuspage.c
+++ /dev/null
@@ -1,467 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- web status page
- Copyright (C) Andrew Tridgell 1997-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 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/>.
-*/
-
-#include "includes.h"
-#include "web/swat_proto.h"
-#include "libcli/security/security.h"
-#include "locking/proto.h"
-#include "librpc/gen_ndr/open_files.h"
-#include "lib/conn_tdb.h"
-#include "../lib/util/pidfile.h"
-
-#define _(x) lang_msg_rotate(talloc_tos(),x)
-
-#define PIDMAP struct PidMap
-
-/* how long to wait for start/stops to take effect */
-#define SLEEP_TIME 3
-
-PIDMAP {
- PIDMAP *next, *prev;
- struct server_id pid;
- char *machine;
-};
-
-static PIDMAP *pidmap;
-static int PID_or_Machine; /* 0 = show PID, else show Machine name */
-
-static struct server_id smbd_pid;
-
-/* from 2nd call on, remove old list */
-static void initPid2Machine (void)
-{
- /* show machine name rather PID on table "Open Files"? */
- if (PID_or_Machine) {
- PIDMAP *p, *next;
-
- for (p = pidmap; p != NULL; p = next) {
- next = p->next;
- DLIST_REMOVE(pidmap, p);
- SAFE_FREE(p->machine);
- SAFE_FREE(p);
- }
-
- pidmap = NULL;
- }
-}
-
-/* add new PID <-> Machine name mapping */
-static void addPid2Machine (struct server_id pid, const char *machine)
-{
- /* show machine name rather PID on table "Open Files"? */
- if (PID_or_Machine) {
- PIDMAP *newmap;
-
- if ((newmap = SMB_MALLOC_P(PIDMAP)) == NULL) {
- /* XXX need error message for this?
- if malloc fails, PID is always shown */
- return;
- }
-
- newmap->pid = pid;
- newmap->machine = SMB_STRDUP(machine);
-
- DLIST_ADD(pidmap, newmap);
- }
-}
-
-/* lookup PID <-> Machine name mapping */
-static char *mapPid2Machine (struct server_id pid)
-{
- static char pidbuf [64];
- PIDMAP *map;
-
- /* show machine name rather PID on table "Open Files"? */
- if (PID_or_Machine) {
- for (map = pidmap; map != NULL; map = map->next) {
- if (serverid_equal(&pid, &map->pid)) {
- if (map->machine == NULL) /* no machine name */
- break; /* show PID */
-
- return map->machine;
- }
- }
- }
-
- /* PID not in list or machine name NULL? return pid as string */
- snprintf (pidbuf, sizeof (pidbuf) - 1, "%s",
- procid_str_static(&pid));
- return pidbuf;
-}
-
-static const char *tstring(TALLOC_CTX *ctx, time_t t)
-{
- char *buf;
- buf = talloc_strdup(ctx, time_to_asc(t));
- if (!buf) {
- return "";
- }
- buf = talloc_all_string_sub(ctx,
- buf,
- " ",
- "&nbsp;");
- if (!buf) {
- return "";
- }
- return buf;
-}
-
-static void print_share_mode(const struct share_mode_entry *e,
- const char *sharepath,
- const char *fname,
- void *dummy)
-{
- char *utf8_fname;
- char *utf8_sharepath;
- int deny_mode;
- size_t converted_size;
-
- if (!is_valid_share_mode_entry(e)) {
- return;
- }
-
- deny_mode = map_share_mode_to_deny_mode(e->share_access,
- e->private_options);
-
- printf("<tr><td>%s</td>",_(mapPid2Machine(e->pid)));
- printf("<td>%u</td>",(unsigned int)e->uid);
- printf("<td>");
- switch ((deny_mode>>4)&0xF) {
- case DENY_NONE: printf("DENY_NONE"); break;
- case DENY_ALL: printf("DENY_ALL "); break;
- case DENY_DOS: printf("DENY_DOS "); break;
- case DENY_FCB: printf("DENY_FCB "); break;
- case DENY_READ: printf("DENY_READ "); break;
- case DENY_WRITE:printf("DENY_WRITE "); break;
- }
- printf("</td>");
-
- printf("<td>");
- if (e->access_mask & (FILE_READ_DATA|FILE_WRITE_DATA)) {
- printf("%s", _("RDWR "));
- } else if (e->access_mask & FILE_WRITE_DATA) {
- printf("%s", _("WRONLY "));
- } else {
- printf("%s", _("RDONLY "));
- }
- printf("</td>");
-
- printf("<td>");
- if((e->op_type &
- (EXCLUSIVE_OPLOCK|BATCH_OPLOCK)) ==
- (EXCLUSIVE_OPLOCK|BATCH_OPLOCK))
- printf("EXCLUSIVE+BATCH ");
- else if (e->op_type & EXCLUSIVE_OPLOCK)
- printf("EXCLUSIVE ");
- else if (e->op_type & BATCH_OPLOCK)
- printf("BATCH ");
- else if (e->op_type & LEVEL_II_OPLOCK)
- printf("LEVEL_II ");
- else
- printf("NONE ");
- printf("</td>");
-
- push_utf8_talloc(talloc_tos(), &utf8_fname, fname, &converted_size);
- push_utf8_talloc(talloc_tos(), &utf8_sharepath, sharepath,
- &converted_size);
- printf("<td>%s</td><td>%s</td><td>%s</td></tr>\n",
- utf8_sharepath,utf8_fname,tstring(talloc_tos(),e->time.tv_sec));
- TALLOC_FREE(utf8_fname);
-}
-
-
-/* kill off any connections chosen by the user */
-static int traverse_fn1(const struct connections_key *key,
- const struct connections_data *crec,
- void *private_data)
-{
- if (crec->cnum == TID_FIELD_INVALID && process_exists(crec->pid)) {
- char buf[30];
- slprintf(buf,sizeof(buf)-1,"kill_%s", procid_str_static(&crec->pid));
- if (cgi_variable(buf)) {
- kill_pid(crec->pid);
- sleep(SLEEP_TIME);
- }
- }
- return 0;
-}
-
-/* traversal fn for showing machine connections */
-static int traverse_fn2(const struct connections_key *key,
- const struct connections_data *crec,
- void *private_data)
-{
- if (crec->cnum == TID_FIELD_INVALID || !process_exists(crec->pid) ||
- serverid_equal(&crec->pid, &smbd_pid))
- return 0;
-
- addPid2Machine (crec->pid, crec->machine);
-
- printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td>\n",
- procid_str_static(&crec->pid),
- crec->machine, crec->addr,
- tstring(talloc_tos(),crec->start));
- if (geteuid() == 0) {
- printf("<td><input type=submit value=\"X\" name=\"kill_%s\"></td>\n",
- procid_str_static(&crec->pid));
- }
- printf("</tr>\n");
-
- return 0;
-}
-
-/* traversal fn for showing share connections */
-static int traverse_fn3(const struct connections_key *key,
- const struct connections_data *crec,
- void *private_data)
-{
- if (crec->cnum == TID_FIELD_INVALID || !process_exists(crec->pid))
- return 0;
-
- printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>\n",
- crec->servicename, uidtoname(crec->uid),
- gidtoname(crec->gid),procid_str_static(&crec->pid),
- crec->machine,
- tstring(talloc_tos(),crec->start));
- return 0;
-}
-
-
-/* show the current server status */
-void status_page(void)
-{
- const char *v;
- int autorefresh=0;
- int refresh_interval=30;
- int nr_running=0;
- bool waitup = False;
- TALLOC_CTX *ctx = talloc_stackframe();
- const char form_name[] = "status";
-
- smbd_pid = pid_to_procid(pidfile_pid(lp_piddir(), "smbd"));
-
- if (!verify_xsrf_token(form_name)) {
- goto output_page;
- }
-
- if (cgi_variable("smbd_restart") || cgi_variable("all_restart")) {
- stop_smbd();
- start_smbd();
- waitup=True;
- }
-
- if (cgi_variable("smbd_start") || cgi_variable("all_start")) {
- start_smbd();
- waitup=True;
- }
-
- if (cgi_variable("smbd_stop") || cgi_variable("all_stop")) {
- stop_smbd();
- waitup=True;
- }
-
- if (cgi_variable("nmbd_restart") || cgi_variable("all_restart")) {
- stop_nmbd();
- start_nmbd();
- waitup=True;
- }
- if (cgi_variable("nmbd_start") || cgi_variable("all_start")) {
- start_nmbd();
- waitup=True;
- }
-
- if (cgi_variable("nmbd_stop")|| cgi_variable("all_stop")) {
- stop_nmbd();
- waitup=True;
- }
-
-#ifdef WITH_WINBIND
- if (cgi_variable("winbindd_restart") || cgi_variable("all_restart")) {
- stop_winbindd();
- start_winbindd();
- waitup=True;
- }
-
- if (cgi_variable("winbindd_start") || cgi_variable("all_start")) {
- start_winbindd();
- waitup=True;
- }
-
- if (cgi_variable("winbindd_stop") || cgi_variable("all_stop")) {
- stop_winbindd();
- waitup=True;
- }
-#endif
- /* wait for daemons to start/stop */
- if (waitup)
- sleep(SLEEP_TIME);
-
- if (cgi_variable("autorefresh")) {
- autorefresh = 1;
- } else if (cgi_variable("norefresh")) {
- autorefresh = 0;
- } else if (cgi_variable("refresh")) {
- autorefresh = 1;
- }
-
- if ((v=cgi_variable("refresh_interval"))) {
- refresh_interval = atoi(v);
- }
-
- if (cgi_variable("show_client_in_col_1")) {
- PID_or_Machine = 1;
- }
-
- if (cgi_variable("show_pid_in_col_1")) {
- PID_or_Machine = 0;
- }
-
- connections_forall_read(traverse_fn1, NULL);
-
- initPid2Machine ();
-
-output_page:
- printf("<H2>%s</H2>\n", _("Server Status"));
-
- printf("<FORM method=post>\n");
- print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name);
-
- if (!autorefresh) {
- printf("<input type=submit value=\"%s\" name=\"autorefresh\">\n", _("Auto Refresh"));
- printf("<br>%s", _("Refresh Interval: "));
- printf("<input type=text size=2 name=\"refresh_interval\" value=\"%d\">\n",
- refresh_interval);
- } else {
- printf("<input type=submit value=\"%s\" name=\"norefresh\">\n", _("Stop Refreshing"));
- printf("<br>%s%d\n", _("Refresh Interval: "), refresh_interval);
- printf("<input type=hidden name=\"refresh\" value=\"1\">\n");
- }
-
- printf("<p>\n");
-
- printf("<table>\n");
-
- printf("<tr><td>%s</td><td>%s</td></tr>", _("version:"), samba_version_string());
-
- fflush(stdout);
- printf("<tr><td>%s</td><td>%s</td>\n", _("smbd:"), smbd_running()?_("running"):_("not running"));
- if (geteuid() == 0) {
- if (smbd_running()) {
- nr_running++;
- printf("<td><input type=submit name=\"smbd_stop\" value=\"%s\"></td>\n", _("Stop smbd"));
- } else {
- printf("<td><input type=submit name=\"smbd_start\" value=\"%s\"></td>\n", _("Start smbd"));
- }
- printf("<td><input type=submit name=\"smbd_restart\" value=\"%s\"></td>\n", _("Restart smbd"));
- }
- printf("</tr>\n");
-
- fflush(stdout);
- printf("<tr><td>%s</td><td>%s</td>\n", _("nmbd:"), nmbd_running()?_("running"):_("not running"));
- if (geteuid() == 0) {
- if (nmbd_running()) {
- nr_running++;
- printf("<td><input type=submit name=\"nmbd_stop\" value=\"%s\"></td>\n", _("Stop nmbd"));
- } else {
- printf("<td><input type=submit name=\"nmbd_start\" value=\"%s\"></td>\n", _("Start nmbd"));
- }
- printf("<td><input type=submit name=\"nmbd_restart\" value=\"%s\"></td>\n", _("Restart nmbd"));
- }
- printf("</tr>\n");
-
-#ifdef WITH_WINBIND
- fflush(stdout);
- printf("<tr><td>%s</td><td>%s</td>\n", _("winbindd:"), winbindd_running()?_("running"):_("not running"));
- if (geteuid() == 0) {
- if (winbindd_running()) {
- nr_running++;
- printf("<td><input type=submit name=\"winbindd_stop\" value=\"%s\"></td>\n", _("Stop winbindd"));
- } else {
- printf("<td><input type=submit name=\"winbindd_start\" value=\"%s\"></td>\n", _("Start winbindd"));
- }
- printf("<td><input type=submit name=\"winbindd_restart\" value=\"%s\"></td>\n", _("Restart winbindd"));
- }
- printf("</tr>\n");
-#endif
-
- if (geteuid() == 0) {
- printf("<tr><td></td><td></td>\n");
- if (nr_running >= 1) {
- /* stop, restart all */
- printf("<td><input type=submit name=\"all_stop\" value=\"%s\"></td>\n", _("Stop All"));
- printf("<td><input type=submit name=\"all_restart\" value=\"%s\"></td>\n", _("Restart All"));
- }
- else if (nr_running == 0) {
- /* start all */
- printf("<td><input type=submit name=\"all_start\" value=\"%s\"></td>\n", _("Start All"));
- }
- printf("</tr>\n");
- }
- printf("</table>\n");
- fflush(stdout);
-
- printf("<p><h3>%s</h3>\n", _("Active Connections"));
- printf("<table border=1>\n");
- printf("<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th>\n", _("PID"), _("Client"), _("IP address"), _("Date"));
- if (geteuid() == 0) {
- printf("<th>%s</th>\n", _("Kill"));
- }
- printf("</tr>\n");
-
- connections_forall_read(traverse_fn2, NULL);
-
- printf("</table><p>\n");
-
- printf("<p><h3>%s</h3>\n", _("Active Shares"));
- printf("<table border=1>\n");
- printf("<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>\n\n",
- _("Share"), _("User"), _("Group"), _("PID"), _("Client"), _("Date"));
-
- connections_forall_read(traverse_fn3, NULL);
-
- printf("</table><p>\n");
-
- printf("<h3>%s</h3>\n", _("Open Files"));
- printf("<table border=1>\n");
- printf("<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>\n",
- _("PID"), _("UID"), _("Sharing"), _("R/W"), _("Oplock"), _("Share"), _("File"), _("Date"));
-
- locking_init_readonly();
- share_mode_forall(print_share_mode, NULL);
- locking_end();
- printf("</table>\n");
-
- printf("<br><input type=submit name=\"show_client_in_col_1\" value=\"%s\">\n", _("Show Client in col 1"));
- printf("<input type=submit name=\"show_pid_in_col_1\" value=\"%s\">\n", _("Show PID in col 1"));
-
- printf("</FORM>\n");
-
- if (autorefresh) {
- /* this little JavaScript allows for automatic refresh
- of the page. There are other methods but this seems
- to be the best alternative */
- printf("<script language=\"JavaScript\">\n");
- printf("<!--\nsetTimeout('window.location.replace(\"%s/status?refresh_interval=%d&refresh=1\")', %d)\n",
- cgi_baseurl(),
- refresh_interval,
- refresh_interval*1000);
- printf("//-->\n</script>\n");
- }
- TALLOC_FREE(ctx);
-}
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 90e4af9958..bbacdd15b3 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -1,4 +1,4 @@
-/*
+/*
Unix SMB/CIFS implementation.
Samba Web Administration Tool
Version 3.0.0
@@ -18,1650 +18,41 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
-/**
- * @defgroup swat SWAT - Samba Web Administration Tool
- * @{
- * @file swat.c
- *
- * @brief Samba Web Administration Tool.
- **/
-
-#include "includes.h"
-#include "system/filesys.h"
-#include "popt_common.h"
-#include "web/swat_proto.h"
-#include "printing/pcap.h"
-#include "printing/load.h"
-#include "passdb.h"
-#include "intl/lang_tdb.h"
-#include "../lib/crypto/md5.h"
-#include "lib/param/loadparm.h"
-#include "messages.h"
-
-static int demo_mode = False;
-static int passwd_only = False;
-static bool have_write_access = False;
-static bool have_read_access = False;
-static int iNumNonAutoPrintServices = 0;
-
/*
- * Password Management Globals
+ * 1997 - 2013 SWAT
+ * R.I.P. :,
+ * Finally swatted, you will bug us no more. @,@
+ * +#`@
+ * @`:@
+ * ,' :@ #'
+ * + @ @: @.
+ * @ + ,@ .@
+ * ;` ; @; #+
+ * @@` @ @ ;@ @`
+ * # :@ ' # @, ##
+ * @ +. # ` ## .@
+ * # # ' ;@ @;
+ *, ' # + ,@` @@
+ *' ` + : .@, #@
+ *# `@@#. : ;@: '@
+ *+. #` ,#@@@@@@@@@@@@@ #@` @@
+ * .@@. @ `#@+,` `##@+ + .@@ `@#
+ * +@. @ ;@;. `:;# '`:+@ `@@, +@:
+ * :@,#, +`:;;;#.@@.:' :@@: '@#
+ * + ,: '+@@@@@@@@@+ ;@@+ '@@
+ * .: :@@;. @: ;;+@@; ;@@'
+ * # ,#@', @# .`;#@ @
+ * # .@ '' ; @
+ * @ ,:@@@+;++..+,. @
+ * @ @+;+@+@, . ;` @'
+ * @ : . @,'@ '
+ * .@@+#+''''++#@@@+;.,
+ * .@ @'. : :++@@# .
+ * + @:#@;'+@@@@@#;
+ * ` :@; .@ '#
+ * ,: ,#
+ * , +.
+ * , :
+ * `
+ * +
*/
-#define SWAT_USER "username"
-#define OLD_PSWD "old_passwd"
-#define NEW_PSWD "new_passwd"
-#define NEW2_PSWD "new2_passwd"
-#define CHG_S_PASSWD_FLAG "chg_s_passwd_flag"
-#define CHG_R_PASSWD_FLAG "chg_r_passwd_flag"
-#define ADD_USER_FLAG "add_user_flag"
-#define DELETE_USER_FLAG "delete_user_flag"
-#define DISABLE_USER_FLAG "disable_user_flag"
-#define ENABLE_USER_FLAG "enable_user_flag"
-#define RHOST "remote_host"
-#define XSRF_TOKEN "xsrf"
-#define XSRF_TIME "xsrf_time"
-#define XSRF_TIMEOUT 300
-
-#define _(x) lang_msg_rotate(talloc_tos(),x)
-
-/****************************************************************************
-****************************************************************************/
-static int enum_index(int value, const struct enum_list *enumlist)
-{
- int i;
- for (i=0;enumlist[i].name;i++)
- if (value == enumlist[i].value) break;
- return(i);
-}
-
-static char *fix_backslash(const char *str)
-{
- static char newstring[1024];
- char *p = newstring;
-
- while (*str) {
- if (*str == '\\') {*p++ = '\\';*p++ = '\\';}
- else *p++ = *str;
- ++str;
- }
- *p = '\0';
- return newstring;
-}
-
-static const char *fix_quotes(TALLOC_CTX *ctx, char *str)
-{
- char *newstring = NULL;
- char *p = NULL;
- size_t newstring_len;
- int quote_len = strlen("&quot;");
-
- /* Count the number of quotes. */
- newstring_len = 1;
- p = (char *) str;
- while (*p) {
- if ( *p == '\"') {
- newstring_len += quote_len;
- } else {
- newstring_len++;
- }
- ++p;
- }
- newstring = talloc_array(ctx, char, newstring_len);
- if (!newstring) {
- return "";
- }
- for (p = newstring; *str; str++) {
- if ( *str == '\"') {
- strncpy( p, "&quot;", quote_len);
- p += quote_len;
- } else {
- *p++ = *str;
- }
- }
- *p = '\0';
- return newstring;
-}
-
-static char *stripspaceupper(const char *str)
-{
- static char newstring[1024];
- char *p = newstring;
-
- while (*str) {
- if (*str != ' ') *p++ = toupper_m(*str);
- ++str;
- }
- *p = '\0';
- return newstring;
-}
-
-static char *make_parm_name(const char *label)
-{
- static char parmname[1024];
- char *p = parmname;
-
- while (*label) {
- if (*label == ' ') *p++ = '_';
- else *p++ = *label;
- ++label;
- }
- *p = '\0';
- return parmname;
-}
-
-void get_xsrf_token(const char *username, const char *pass,
- const char *formname, time_t xsrf_time, char token_str[33])
-{
- struct MD5Context md5_ctx;
- uint8_t token[16];
- int i;
-
- token_str[0] = '\0';
- ZERO_STRUCT(md5_ctx);
- MD5Init(&md5_ctx);
-
- MD5Update(&md5_ctx, (uint8_t *)formname, strlen(formname));
- MD5Update(&md5_ctx, (uint8_t *)&xsrf_time, sizeof(time_t));
- if (username != NULL) {
- MD5Update(&md5_ctx, (uint8_t *)username, strlen(username));
- }
- if (pass != NULL) {
- MD5Update(&md5_ctx, (uint8_t *)pass, strlen(pass));
- }
-
- MD5Final(token, &md5_ctx);
-
- for(i = 0; i < sizeof(token); i++) {
- char tmp[3];
-
- snprintf(tmp, sizeof(tmp), "%02x", token[i]);
- /* FIXME ! Truncate check. JRA. */
- (void)strlcat(token_str, tmp, sizeof(tmp));
- }
-}
-
-void print_xsrf_token(const char *username, const char *pass,
- const char *formname)
-{
- char token[33];
- time_t xsrf_time = time(NULL);
-
- get_xsrf_token(username, pass, formname, xsrf_time, token);
- printf("<input type=\"hidden\" name=\"%s\" value=\"%s\">\n",
- XSRF_TOKEN, token);
- printf("<input type=\"hidden\" name=\"%s\" value=\"%lld\">\n",
- XSRF_TIME, (long long int)xsrf_time);
-}
-
-bool verify_xsrf_token(const char *formname)
-{
- char expected[33];
- const char *username = cgi_user_name();
- const char *pass = cgi_user_pass();
- const char *token = cgi_variable_nonull(XSRF_TOKEN);
- const char *time_str = cgi_variable_nonull(XSRF_TIME);
- char *p = NULL;
- long long xsrf_time_ll = 0;
- time_t xsrf_time = 0;
- time_t now = time(NULL);
-
- errno = 0;
- xsrf_time_ll = strtoll(time_str, &p, 10);
- if (errno != 0) {
- return false;
- }
- if (p == NULL) {
- return false;
- }
- if (PTR_DIFF(p, time_str) > strlen(time_str)) {
- return false;
- }
- if (xsrf_time_ll > _TYPE_MAXIMUM(time_t)) {
- return false;
- }
- if (xsrf_time_ll < _TYPE_MINIMUM(time_t)) {
- return false;
- }
- xsrf_time = xsrf_time_ll;
-
- if (abs(now - xsrf_time) > XSRF_TIMEOUT) {
- return false;
- }
-
- get_xsrf_token(username, pass, formname, xsrf_time, expected);
- return (strncmp(expected, token, sizeof(expected)) == 0);
-}
-
-
-/****************************************************************************
- include a lump of html in a page
-****************************************************************************/
-static int include_html(const char *fname)
-{
- int fd;
- char buf[1024];
- int ret;
-
- fd = web_open(fname, O_RDONLY, 0);
-
- if (fd == -1) {
- printf(_("ERROR: Can't open %s"), fname);
- printf("\n");
- return 0;
- }
-
- while ((ret = read(fd, buf, sizeof(buf))) > 0) {
- if (write(1, buf, ret) == -1) {
- break;
- }
- }
-
- close(fd);
- return 1;
-}
-
-/****************************************************************************
- start the page with standard stuff
-****************************************************************************/
-static void print_header(void)
-{
- if (!cgi_waspost()) {
- printf("Expires: 0\r\n");
- }
- printf("Content-type: text/html\r\n\r\n");
-
- if (!include_html("include/header.html")) {
- printf("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\">\n");
- printf("<HTML>\n<HEAD>\n<TITLE>Samba Web Administration Tool</TITLE>\n</HEAD>\n<BODY background=\"/swat/images/background.jpg\">\n\n");
- }
-}
-
-/* *******************************************************************
- show parameter label with translated name in the following form
- because showing original and translated label in one line looks
- too long, and showing translated label only is unusable for
- heavy users.
- -------------------------------
- HELP security [combo box][button]
- SECURITY
- -------------------------------
- (capital words are translated by gettext.)
- if no translation is available, then same form as original is
- used.
- "i18n_translated_parm" class is used to change the color of the
- translated parameter with CSS.
- **************************************************************** */
-static const char *get_parm_translated(TALLOC_CTX *ctx,
- const char* pAnchor, const char* pHelp, const char* pLabel)
-{
- const char *pTranslated = _(pLabel);
- char *output;
- if(strcmp(pLabel, pTranslated) != 0) {
- output = talloc_asprintf(ctx,
- "<A HREF=\"/swat/help/manpages/smb.conf.5.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s <br><span class=\"i18n_translated_parm\">%s</span>",
- pAnchor, pHelp, pLabel, pTranslated);
- return output;
- }
- output = talloc_asprintf(ctx,
- "<A HREF=\"/swat/help/manpages/smb.conf.5.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s",
- pAnchor, pHelp, pLabel);
- return output;
-}
-/****************************************************************************
- finish off the page
-****************************************************************************/
-static void print_footer(void)
-{
- if (!include_html("include/footer.html")) {
- printf("\n</BODY>\n</HTML>\n");
- }
-}
-
-/****************************************************************************
- display one editable parameter in a form
-****************************************************************************/
-static void show_parameter(int snum, struct parm_struct *parm)
-{
- int i;
- void *ptr;
- char *utf8_s1, *utf8_s2;
- size_t converted_size;
- TALLOC_CTX *ctx = talloc_stackframe();
-
- if (parm->p_class == P_LOCAL && snum >= 0) {
- ptr = lp_local_ptr_by_snum(snum, parm);
- } else {
- ptr = lp_parm_ptr(NULL, parm);
- }
-
- printf("<tr><td>%s</td><td>", get_parm_translated(ctx,
- stripspaceupper(parm->label), _("Help"), parm->label));
- switch (parm->type) {
- case P_CHAR:
- printf("<input type=text size=2 name=\"parm_%s\" value=\"%c\">",
- make_parm_name(parm->label), *(char *)ptr);
- printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%c\'\">",
- _("Set Default"), make_parm_name(parm->label),(char)(parm->def.cvalue));
- break;
-
- case P_LIST:
- printf("<input type=text size=40 name=\"parm_%s\" value=\"",
- make_parm_name(parm->label));
- if ((char ***)ptr && *(char ***)ptr && **(char ***)ptr) {
- char **list = *(char ***)ptr;
- for (;*list;list++) {
- /* enclose in HTML encoded quotes if the string contains a space */
- if ( strchr_m(*list, ' ') ) {
- push_utf8_talloc(talloc_tos(), &utf8_s1, *list, &converted_size);
- push_utf8_talloc(talloc_tos(), &utf8_s2, ((*(list+1))?", ":""), &converted_size);
- printf("&quot;%s&quot;%s", utf8_s1, utf8_s2);
- } else {
- push_utf8_talloc(talloc_tos(), &utf8_s1, *list, &converted_size);
- push_utf8_talloc(talloc_tos(), &utf8_s2, ((*(list+1))?", ":""), &converted_size);
- printf("%s%s", utf8_s1, utf8_s2);
- }
- TALLOC_FREE(utf8_s1);
- TALLOC_FREE(utf8_s2);
- }
- }
- printf("\">");
- printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'",
- _("Set Default"), make_parm_name(parm->label));
- if (parm->def.lvalue) {
- char **list = (char **)(parm->def.lvalue);
- for (; *list; list++) {
- /* enclose in HTML encoded quotes if the string contains a space */
- if ( strchr_m(*list, ' ') )
- printf("&quot;%s&quot;%s", *list, ((*(list+1))?", ":""));
- else
- printf("%s%s", *list, ((*(list+1))?", ":""));
- }
- }
- printf("\'\">");
- break;
-
- case P_STRING:
- case P_USTRING:
- push_utf8_talloc(talloc_tos(), &utf8_s1, *(char **)ptr, &converted_size);
- printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
- make_parm_name(parm->label), fix_quotes(ctx, utf8_s1));
- TALLOC_FREE(utf8_s1);
- printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
- _("Set Default"), make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue)));
- break;
-
- case P_BOOL:
- printf("<select name=\"parm_%s\">",make_parm_name(parm->label));
- printf("<option %s>Yes", (*(bool *)ptr)?"selected":"");
- printf("<option %s>No", (*(bool *)ptr)?"":"selected");
- printf("</select>");
- printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
- _("Set Default"), make_parm_name(parm->label),(bool)(parm->def.bvalue)?0:1);
- break;
-
- case P_BOOLREV:
- printf("<select name=\"parm_%s\">",make_parm_name(parm->label));
- printf("<option %s>Yes", (*(bool *)ptr)?"":"selected");
- printf("<option %s>No", (*(bool *)ptr)?"selected":"");
- printf("</select>");
- printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
- _("Set Default"), make_parm_name(parm->label),(bool)(parm->def.bvalue)?1:0);
- break;
-
- case P_INTEGER:
- case P_BYTES:
- printf("<input type=text size=8 name=\"parm_%s\" value=\"%d\">", make_parm_name(parm->label), *(int *)ptr);
- printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%d\'\">",
- _("Set Default"), make_parm_name(parm->label),(int)(parm->def.ivalue));
- break;
-
- case P_OCTAL: {
- char *o;
- o = octal_string(*(int *)ptr);
- printf("<input type=text size=8 name=\"parm_%s\" value=%s>",
- make_parm_name(parm->label), o);
- TALLOC_FREE(o);
- o = octal_string((int)(parm->def.ivalue));
- printf("<input type=button value=\"%s\" "
- "onClick=\"swatform.parm_%s.value=\'%s\'\">",
- _("Set Default"), make_parm_name(parm->label), o);
- TALLOC_FREE(o);
- break;
- }
-
- case P_ENUM:
- printf("<select name=\"parm_%s\">",make_parm_name(parm->label));
- for (i=0;parm->enum_list[i].name;i++) {
- if (i == 0 || parm->enum_list[i].value != parm->enum_list[i-1].value) {
- printf("<option %s>%s",(*(int *)ptr)==parm->enum_list[i].value?"selected":"",parm->enum_list[i].name);
- }
- }
- printf("</select>");
- printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
- _("Set Default"), make_parm_name(parm->label),enum_index((int)(parm->def.ivalue),parm->enum_list));
- break;
- case P_SEP:
- break;
- }
- printf("</td></tr>\n");
- TALLOC_FREE(ctx);
-}
-
-/****************************************************************************
- display a set of parameters for a service
-****************************************************************************/
-static void show_parameters(int snum, int allparameters, unsigned int parm_filter, int printers)
-{
- int i = 0;
- struct parm_struct *parm;
- const char *heading = NULL;
- const char *last_heading = NULL;
-
- while ((parm = lp_next_parameter(snum, &i, allparameters))) {
- if (snum < 0 && parm->p_class == P_LOCAL && !(parm->flags & FLAG_GLOBAL))
- continue;
- if (parm->p_class == P_SEPARATOR) {
- heading = parm->label;
- continue;
- }
- if (parm->flags & FLAG_HIDE) continue;
- if (snum >= 0) {
- if (printers & !(parm->flags & FLAG_PRINT)) continue;
- if (!printers & !(parm->flags & FLAG_SHARE)) continue;
- }
-
- if (!( parm_filter & FLAG_ADVANCED )) {
- if (!(parm->flags & FLAG_BASIC)) {
- void *ptr;
- if (parm->p_class == P_LOCAL && snum >= 0) {
- ptr = lp_local_ptr_by_snum(snum, parm);
- } else {
- ptr = lp_parm_ptr(NULL, parm);
- }
-
- switch (parm->type) {
- case P_CHAR:
- if (*(char *)ptr == (char)(parm->def.cvalue)) continue;
- break;
-
- case P_LIST:
- if (!str_list_equal(*(const char ***)ptr,
- (const char **)(parm->def.lvalue))) continue;
- break;
-
- case P_STRING:
- case P_USTRING:
- if (!strcmp(*(char **)ptr,(char *)(parm->def.svalue))) continue;
- break;
-
- case P_BOOL:
- case P_BOOLREV:
- if (*(bool *)ptr == (bool)(parm->def.bvalue)) continue;
- break;
-
- case P_INTEGER:
- case P_BYTES:
- case P_OCTAL:
- if (*(int *)ptr == (int)(parm->def.ivalue)) continue;
- break;
-
-
- case P_ENUM:
- if (*(int *)ptr == (int)(parm->def.ivalue)) continue;
- break;
- case P_SEP:
- continue;
- }
- }
- if (printers && !(parm->flags & FLAG_PRINT)) continue;
- }
-
- if ((parm_filter & FLAG_WIZARD) && !(parm->flags & FLAG_WIZARD)) continue;
-
- if ((parm_filter & FLAG_ADVANCED) && !(parm->flags & FLAG_ADVANCED)) continue;
-
- if (heading && heading != last_heading) {
- printf("<tr><td></td></tr><tr><td><b><u>%s</u></b></td></tr>\n", _(heading));
- last_heading = heading;
- }
- show_parameter(snum, parm);
- }
-}
-
-/****************************************************************************
- load the smb.conf file into loadparm.
-****************************************************************************/
-static bool load_config(bool save_def)
-{
- return lp_load(get_dyn_CONFIGFILE(),False,save_def,False,True);
-}
-
-/****************************************************************************
- write a config file
-****************************************************************************/
-static void write_config(FILE *f, bool show_defaults)
-{
- TALLOC_CTX *ctx = talloc_stackframe();
-
- fprintf(f, "# Samba config file created using SWAT\n");
- fprintf(f, "# from %s (%s)\n", cgi_remote_host(), cgi_remote_addr());
- fprintf(f, "# Date: %s\n\n", current_timestring(ctx, False));
-
- lp_dump(f, show_defaults, iNumNonAutoPrintServices);
-
- TALLOC_FREE(ctx);
-}
-
-/****************************************************************************
- save and reload the smb.conf config file
-****************************************************************************/
-static int save_reload(int snum)
-{
- FILE *f;
- struct stat st;
-
- f = fopen(get_dyn_CONFIGFILE(),"w");
- if (!f) {
- printf(_("failed to open %s for writing"), get_dyn_CONFIGFILE());
- printf("\n");
- return 0;
- }
-
- /* just in case they have used the buggy xinetd to create the file */
- if (fstat(fileno(f), &st) == 0 &&
- (st.st_mode & S_IWOTH)) {
-#if defined HAVE_FCHMOD
- fchmod(fileno(f), S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH);
-#else
- chmod(get_dyn_CONFIGFILE(), S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH);
-#endif
- }
-
- write_config(f, False);
- if (snum >= 0)
- lp_dump_one(f, False, snum);
- fclose(f);
-
- lp_kill_all_services();
-
- if (!load_config(False)) {
- printf(_("Can't reload %s"), get_dyn_CONFIGFILE());
- printf("\n");
- return 0;
- }
- iNumNonAutoPrintServices = lp_numservices();
- if (pcap_cache_loaded()) {
- struct tevent_context *ev_ctx;
- struct messaging_context *msg_ctx;
-
- ev_ctx = s3_tevent_context_init(NULL);
- if (ev_ctx == NULL) {
- printf("s3_tevent_context_init() failed\n");
- return 0;
- }
- msg_ctx = messaging_init(ev_ctx, ev_ctx);
- if (msg_ctx == NULL) {
- printf("messaging_init() failed\n");
- return 0;
- }
-
- load_printers(ev_ctx, msg_ctx);
-
- talloc_free(ev_ctx);
- }
-
- return 1;
-}
-
-/****************************************************************************
- commit one parameter
-****************************************************************************/
-static void commit_parameter(int snum, struct parm_struct *parm, const char *v)
-{
- int i;
- char *s;
-
- if (snum < 0 && parm->p_class == P_LOCAL) {
- /* this handles the case where we are changing a local
- variable globally. We need to change the parameter in
- all shares where it is currently set to the default */
- for (i=0;i<lp_numservices();i++) {
- s = lp_servicename(talloc_tos(), i);
- if (s && (*s) && lp_is_default(i, parm)) {
- lp_do_parameter(i, parm->label, v);
- }
- }
- }
-
- lp_do_parameter(snum, parm->label, v);
-}
-
-/****************************************************************************
- commit a set of parameters for a service
-****************************************************************************/
-static void commit_parameters(int snum)
-{
- int i = 0;
- struct parm_struct *parm;
- char *label;
- const char *v;
-
- while ((parm = lp_next_parameter(snum, &i, 1))) {
- if (asprintf(&label, "parm_%s", make_parm_name(parm->label)) > 0) {
- if ((v = cgi_variable(label)) != NULL) {
- if (parm->flags & FLAG_HIDE)
- continue;
- commit_parameter(snum, parm, v);
- }
- SAFE_FREE(label);
- }
- }
-}
-
-/****************************************************************************
- spit out the html for a link with an image
-****************************************************************************/
-static void image_link(const char *name, const char *hlink, const char *src)
-{
- printf("<A HREF=\"%s/%s\"><img border=\"0\" src=\"/swat/%s\" alt=\"%s\"></A>\n",
- cgi_baseurl(), hlink, src, name);
-}
-
-/****************************************************************************
- display the main navigation controls at the top of each page along
- with a title
-****************************************************************************/
-static void show_main_buttons(void)
-{
- char *p;
-
- if ((p = cgi_user_name()) && strcmp(p, "root")) {
- printf(_("Logged in as <b>%s</b>"), p);
- printf("<p>\n");
- }
-
- image_link(_("Home"), "", "images/home.gif");
- if (have_write_access) {
- image_link(_("Globals"), "globals", "images/globals.gif");
- image_link(_("Shares"), "shares", "images/shares.gif");
- image_link(_("Printers"), "printers", "images/printers.gif");
- image_link(_("Wizard"), "wizard", "images/wizard.gif");
- }
- /* root always gets all buttons, otherwise look for -P */
- if ( have_write_access || (!passwd_only && have_read_access) ) {
- image_link(_("Status"), "status", "images/status.gif");
- image_link(_("View Config"), "viewconfig", "images/viewconfig.gif");
- }
- image_link(_("Password Management"), "passwd", "images/passwd.gif");
-
- printf("<HR>\n");
-}
-
-/****************************************************************************
- * Handle Display/Edit Mode CGI
- ****************************************************************************/
-static void ViewModeBoxes(int mode)
-{
- printf("<p>%s:&nbsp;\n", _("Current View Is"));
- printf("<input type=radio name=\"ViewMode\" value=0 %s>%s\n", ((mode == 0) ? "checked" : ""), _("Basic"));
- printf("<input type=radio name=\"ViewMode\" value=1 %s>%s\n", ((mode == 1) ? "checked" : ""), _("Advanced"));
- printf("<br>%s:&nbsp;\n", _("Change View To"));
- printf("<input type=submit name=\"BasicMode\" value=\"%s\">\n", _("Basic"));
- printf("<input type=submit name=\"AdvMode\" value=\"%s\">\n", _("Advanced"));
- printf("</p><br>\n");
-}
-
-/****************************************************************************
- display a welcome page
-****************************************************************************/
-static void welcome_page(void)
-{
- if (file_exist("help/welcome.html")) {
- include_html("help/welcome.html");
- } else {
- include_html("help/welcome-no-samba-doc.html");
- }
-}
-
-/****************************************************************************
- display the current smb.conf
-****************************************************************************/
-static void viewconfig_page(void)
-{
- int full_view=0;
- const char form_name[] = "viewconfig";
-
- if (!verify_xsrf_token(form_name)) {
- goto output_page;
- }
-
- if (cgi_variable("full_view")) {
- full_view = 1;
- }
-
-output_page:
- printf("<H2>%s</H2>\n", _("Current Config"));
- printf("<form method=post>\n");
- print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name);
-
- if (full_view) {
- printf("<input type=submit name=\"normal_view\" value=\"%s\">\n", _("Normal View"));
- } else {
- printf("<input type=submit name=\"full_view\" value=\"%s\">\n", _("Full View"));
- }
-
- printf("<p><pre>");
- write_config(stdout, full_view);
- printf("</pre>");
- printf("</form>\n");
-}
-
-/****************************************************************************
- second screen of the wizard ... Fetch Configuration Parameters
-****************************************************************************/
-static void wizard_params_page(void)
-{
- unsigned int parm_filter = FLAG_WIZARD;
- const char form_name[] = "wizard_params";
-
- /* Here we first set and commit all the parameters that were selected
- in the previous screen. */
-
- printf("<H2>%s</H2>\n", _("Wizard Parameter Edit Page"));
-
- if (!verify_xsrf_token(form_name)) {
- goto output_page;
- }
-
- if (cgi_variable("Commit")) {
- commit_parameters(GLOBAL_SECTION_SNUM);
- save_reload(-1);
- }
-
-output_page:
- printf("<form name=\"swatform\" method=post action=wizard_params>\n");
- print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name);
-
- if (have_write_access) {
- printf("<input type=submit name=\"Commit\" value=\"Commit Changes\">\n");
- }
-
- printf("<input type=reset name=\"Reset Values\" value=\"Reset\">\n");
- printf("<p>\n");
-
- printf("<table>\n");
- show_parameters(GLOBAL_SECTION_SNUM, 1, parm_filter, 0);
- printf("</table>\n");
- printf("</form>\n");
-}
-
-/****************************************************************************
- Utility to just rewrite the smb.conf file - effectively just cleans it up
-****************************************************************************/
-static void rewritecfg_file(void)
-{
- commit_parameters(GLOBAL_SECTION_SNUM);
- save_reload(-1);
- printf("<H2>%s</H2>\n", _("Note: smb.conf file has been read and rewritten"));
-}
-
-/****************************************************************************
- wizard to create/modify the smb.conf file
-****************************************************************************/
-static void wizard_page(void)
-{
- /* Set some variables to collect data from smb.conf */
- int role = 0;
- int winstype = 0;
- int have_home = -1;
- int HomeExpo = 0;
- int SerType = 0;
- const char form_name[] = "wizard";
-
- if (!verify_xsrf_token(form_name)) {
- goto output_page;
- }
-
- if (cgi_variable("Rewrite")) {
- (void) rewritecfg_file();
- return;
- }
-
- if (cgi_variable("GetWizardParams")){
- (void) wizard_params_page();
- return;
- }
-
- if (cgi_variable("Commit")){
- SerType = atoi(cgi_variable_nonull("ServerType"));
- winstype = atoi(cgi_variable_nonull("WINSType"));
- have_home = lp_servicenumber(HOMES_NAME);
- HomeExpo = atoi(cgi_variable_nonull("HomeExpo"));
-
- /* Plain text passwords are too badly broken - use encrypted passwords only */
- lp_do_parameter( GLOBAL_SECTION_SNUM, "encrypt passwords", "Yes");
-
- switch ( SerType ){
- case 0:
- /* Stand-alone Server */
- lp_do_parameter( GLOBAL_SECTION_SNUM, "security", "USER" );
- lp_do_parameter( GLOBAL_SECTION_SNUM, "domain logons", "No" );
- break;
- case 1:
- /* Domain Member */
- lp_do_parameter( GLOBAL_SECTION_SNUM, "security", "DOMAIN" );
- lp_do_parameter( GLOBAL_SECTION_SNUM, "domain logons", "No" );
- break;
- case 2:
- /* Domain Controller */
- lp_do_parameter( GLOBAL_SECTION_SNUM, "security", "USER" );
- lp_do_parameter( GLOBAL_SECTION_SNUM, "domain logons", "Yes" );
- break;
- }
- switch ( winstype ) {
- case 0:
- lp_do_parameter( GLOBAL_SECTION_SNUM, "wins support", "No" );
- lp_do_parameter( GLOBAL_SECTION_SNUM, "wins server", "" );
- break;
- case 1:
- lp_do_parameter( GLOBAL_SECTION_SNUM, "wins support", "Yes" );
- lp_do_parameter( GLOBAL_SECTION_SNUM, "wins server", "" );
- break;
- case 2:
- lp_do_parameter( GLOBAL_SECTION_SNUM, "wins support", "No" );
- lp_do_parameter( GLOBAL_SECTION_SNUM, "wins server", cgi_variable_nonull("WINSAddr"));
- break;
- }
-
- /* Have to create Homes share? */
- if ((HomeExpo == 1) && (have_home == -1)) {
- const char *unix_share = HOMES_NAME;
-
- load_config(False);
- lp_copy_service(GLOBAL_SECTION_SNUM, unix_share);
- have_home = lp_servicenumber(HOMES_NAME);
- lp_do_parameter( have_home, "read only", "No");
- lp_do_parameter( have_home, "valid users", "%S");
- lp_do_parameter( have_home, "browseable", "No");
- commit_parameters(have_home);
- save_reload(have_home);
- }
-
- /* Need to Delete Homes share? */
- if ((HomeExpo == 0) && (have_home != -1)) {
- lp_remove_service(have_home);
- have_home = -1;
- }
-
- commit_parameters(GLOBAL_SECTION_SNUM);
- save_reload(-1);
- }
- else
- {
- /* Now determine smb.conf WINS settings */
- if (lp_we_are_a_wins_server())
- winstype = 1;
- if (lp_wins_server_list() && strlen(*lp_wins_server_list()))
- winstype = 2;
-
- /* Do we have a homes share? */
- have_home = lp_servicenumber(HOMES_NAME);
- }
- if ((winstype == 2) && lp_we_are_a_wins_server())
- winstype = 3;
-
- role = lp_server_role();
-
-output_page:
- /* Here we go ... */
- printf("<H2>%s</H2>\n", _("Samba Configuration Wizard"));
- printf("<form method=post action=wizard>\n");
- print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name);
-
- if (have_write_access) {
- printf("%s\n", _("The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."));
- printf("%s", _("The same will happen if you press the commit button."));
- printf("<br><br>\n");
- printf("<center>");
- printf("<input type=submit name=\"Rewrite\" value=\"%s\"> &nbsp;&nbsp;",_("Rewrite smb.conf file"));
- printf("<input type=submit name=\"Commit\" value=\"%s\"> &nbsp;&nbsp;",_("Commit"));
- printf("<input type=submit name=\"GetWizardParams\" value=\"%s\">", _("Edit Parameter Values"));
- printf("</center>\n");
- }
-
- printf("<hr>");
- printf("<center><table border=0>");
- printf("<tr><td><b>%s:&nbsp;</b></td>\n", _("Server Type"));
- printf("<td><input type=radio name=\"ServerType\" value=\"0\" %s> %s&nbsp;</td>", ((role == ROLE_STANDALONE) ? "checked" : ""), _("Stand Alone"));
- printf("<td><input type=radio name=\"ServerType\" value=\"1\" %s> %s&nbsp;</td>", ((role == ROLE_DOMAIN_MEMBER) ? "checked" : ""), _("Domain Member"));
- printf("<td><input type=radio name=\"ServerType\" value=\"2\" %s> %s&nbsp;</td>", ((role == ROLE_DOMAIN_PDC) ? "checked" : ""), _("Domain Controller"));
- printf("</tr>\n");
- if (role == ROLE_DOMAIN_BDC) {
- printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">%s</font></td></tr>\n", _("Unusual Type in smb.conf - Please Select New Mode"));
- }
- printf("<tr><td><b>%s:&nbsp;</b></td>\n", _("Configure WINS As"));
- printf("<td><input type=radio name=\"WINSType\" value=\"0\" %s> %s&nbsp;</td>", ((winstype == 0) ? "checked" : ""), _("Not Used"));
- printf("<td><input type=radio name=\"WINSType\" value=\"1\" %s> %s&nbsp;</td>", ((winstype == 1) ? "checked" : ""), _("Server for client use"));
- printf("<td><input type=radio name=\"WINSType\" value=\"2\" %s> %s&nbsp;</td>", ((winstype == 2) ? "checked" : ""), _("Client of another WINS server"));
- printf("</tr>\n");
- printf("<tr><td></td><td></td><td></td><td>%s&nbsp;<input type=text size=\"16\" name=\"WINSAddr\" value=\"", _("Remote WINS Server"));
-
- /* Print out the list of wins servers */
- if(lp_wins_server_list()) {
- int i;
- const char **wins_servers = lp_wins_server_list();
- for(i = 0; wins_servers[i]; i++) printf("%s ", wins_servers[i]);
- }
-
- printf("\"></td></tr>\n");
- if (winstype == 3) {
- printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">%s</font></td></tr>\n", _("Error: WINS Server Mode and WINS Support both set in smb.conf"));
- printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">%s</font></td></tr>\n", _("Please Select desired WINS mode above."));
- }
- printf("<tr><td><b>%s:&nbsp;</b></td>\n", _("Expose Home Directories"));
- printf("<td><input type=radio name=\"HomeExpo\" value=\"1\" %s> Yes</td>", (have_home == -1) ? "" : "checked ");
- printf("<td><input type=radio name=\"HomeExpo\" value=\"0\" %s> No</td>", (have_home == -1 ) ? "checked" : "");
- printf("<td></td></tr>\n");
-
- /* Enable this when we are ready ....
- * printf("<tr><td><b>%s:&nbsp;</b></td>\n", _("Is Print Server"));
- * printf("<td><input type=radio name=\"PtrSvr\" value=\"1\" %s> Yes</td>");
- * printf("<td><input type=radio name=\"PtrSvr\" value=\"0\" %s> No</td>");
- * printf("<td></td></tr>\n");
- */
-
- printf("</table></center>");
- printf("<hr>");
-
- printf("%s\n", _("The above configuration options will set multiple parameters and will generally assist with rapid Samba deployment."));
- printf("</form>\n");
-}
-
-
-/****************************************************************************
- display a globals editing page
-****************************************************************************/
-static void globals_page(void)
-{
- unsigned int parm_filter = FLAG_BASIC;
- int mode = 0;
- const char form_name[] = "globals";
-
- printf("<H2>%s</H2>\n", _("Global Parameters"));
-
- if (!verify_xsrf_token(form_name)) {
- goto output_page;
- }
-
- if (cgi_variable("Commit")) {
- commit_parameters(GLOBAL_SECTION_SNUM);
- save_reload(-1);
- }
-
- if ( cgi_variable("ViewMode") )
- mode = atoi(cgi_variable_nonull("ViewMode"));
- if ( cgi_variable("BasicMode"))
- mode = 0;
- if ( cgi_variable("AdvMode"))
- mode = 1;
-
-output_page:
- printf("<form name=\"swatform\" method=post action=globals>\n");
- print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name);
-
- ViewModeBoxes( mode );
- switch ( mode ) {
- case 0:
- parm_filter = FLAG_BASIC;
- break;
- case 1:
- parm_filter = FLAG_ADVANCED;
- break;
- }
- printf("<br>\n");
- if (have_write_access) {
- printf("<input type=submit name=\"Commit\" value=\"%s\">\n",
- _("Commit Changes"));
- }
-
- printf("<input type=reset name=\"Reset Values\" value=\"%s\">\n",
- _("Reset Values"));
-
- printf("<p>\n");
- printf("<table>\n");
- show_parameters(GLOBAL_SECTION_SNUM, 1, parm_filter, 0);
- printf("</table>\n");
- printf("</form>\n");
-}
-
-/****************************************************************************
- display a shares editing page. share is in unix codepage,
-****************************************************************************/
-static void shares_page(void)
-{
- const char *share = cgi_variable("share");
- char *s;
- char *utf8_s;
- int snum = -1;
- int i;
- int mode = 0;
- unsigned int parm_filter = FLAG_BASIC;
- size_t converted_size;
- const char form_name[] = "shares";
-
- printf("<H2>%s</H2>\n", _("Share Parameters"));
-
- if (!verify_xsrf_token(form_name)) {
- goto output_page;
- }
-
- if (share)
- snum = lp_servicenumber(share);
-
-
- if (cgi_variable("Commit") && snum >= 0) {
- commit_parameters(snum);
- save_reload(-1);
- snum = lp_servicenumber(share);
- }
-
- if (cgi_variable("Delete") && snum >= 0) {
- lp_remove_service(snum);
- save_reload(-1);
- share = NULL;
- snum = -1;
- }
-
- if (cgi_variable("createshare") && (share=cgi_variable("newshare"))) {
- snum = lp_servicenumber(share);
- if (snum < 0) {
- load_config(False);
- lp_copy_service(GLOBAL_SECTION_SNUM, share);
- snum = lp_servicenumber(share);
- save_reload(snum);
- snum = lp_servicenumber(share);
- }
- }
-
- if ( cgi_variable("ViewMode") )
- mode = atoi(cgi_variable_nonull("ViewMode"));
- if ( cgi_variable("BasicMode"))
- mode = 0;
- if ( cgi_variable("AdvMode"))
- mode = 1;
-
-output_page:
- printf("<FORM name=\"swatform\" method=post>\n");
- print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name);
-
- printf("<table>\n");
-
- ViewModeBoxes( mode );
- switch ( mode ) {
- case 0:
- parm_filter = FLAG_BASIC;
- break;
- case 1:
- parm_filter = FLAG_ADVANCED;
- break;
- }
- printf("<br><tr>\n");
- printf("<td><input type=submit name=selectshare value=\"%s\"></td>\n", _("Choose Share"));
- printf("<td><select name=share>\n");
- if (snum < 0)
- printf("<option value=\" \"> \n");
- for (i=0;i<lp_numservices();i++) {
- s = lp_servicename(talloc_tos(), i);
- if (s && (*s) && strcmp(s,"IPC$") && !lp_print_ok(i)) {
- push_utf8_talloc(talloc_tos(), &utf8_s, s, &converted_size);
- printf("<option %s value=\"%s\">%s\n",
- (share && strcmp(share,s)==0)?"SELECTED":"",
- utf8_s, utf8_s);
- TALLOC_FREE(utf8_s);
- }
- }
- printf("</select></td>\n");
- if (have_write_access) {
- printf("<td><input type=submit name=\"Delete\" value=\"%s\"></td>\n", _("Delete Share"));
- }
- printf("</tr>\n");
- printf("</table>");
- printf("<table>");
- if (have_write_access) {
- printf("<tr>\n");
- printf("<td><input type=submit name=createshare value=\"%s\"></td>\n", _("Create Share"));
- printf("<td><input type=text size=30 name=newshare></td></tr>\n");
- }
- printf("</table>");
-
-
- if (snum >= 0) {
- if (have_write_access) {
- printf("<input type=submit name=\"Commit\" value=\"%s\">\n", _("Commit Changes"));
- }
-
- printf("<input type=reset name=\"Reset Values\" value=\"%s\">\n", _("Reset Values"));
- printf("<p>\n");
- }
-
- if (snum >= 0) {
- printf("<table>\n");
- show_parameters(snum, 1, parm_filter, 0);
- printf("</table>\n");
- }
-
- printf("</FORM>\n");
-}
-
-/*************************************************************
-change a password either locally or remotely
-*************************************************************/
-static bool change_password(const char *remote_machine, const char *user_name,
- const char *old_passwd, const char *new_passwd,
- int local_flags)
-{
- NTSTATUS ret;
- char *err_str = NULL;
- char *msg_str = NULL;
-
- if (demo_mode) {
- printf("%s\n<p>", _("password change in demo mode rejected"));
- return False;
- }
-
- if (remote_machine != NULL) {
- ret = remote_password_change(remote_machine, user_name,
- old_passwd, new_passwd, &err_str);
- if (err_str != NULL)
- printf("%s\n<p>", err_str);
- SAFE_FREE(err_str);
- return NT_STATUS_IS_OK(ret);
- }
-
- if(!initialize_password_db(True, NULL)) {
- printf("%s\n<p>", _("Can't setup password database vectors."));
- return False;
- }
-
- ret = local_password_change(user_name, local_flags, new_passwd,
- &err_str, &msg_str);
-
- if(msg_str)
- printf("%s\n<p>", msg_str);
- if(err_str)
- printf("%s\n<p>", err_str);
-
- SAFE_FREE(msg_str);
- SAFE_FREE(err_str);
- return NT_STATUS_IS_OK(ret);
-}
-
-/****************************************************************************
- do the stuff required to add or change a password
-****************************************************************************/
-static void chg_passwd(void)
-{
- const char *host;
- bool rslt;
- int local_flags = 0;
-
- /* Make sure users name has been specified */
- if (strlen(cgi_variable_nonull(SWAT_USER)) == 0) {
- printf("<p>%s\n", _(" Must specify \"User Name\" "));
- return;
- }
-
- /*
- * smbpasswd doesn't require anything but the users name to delete, disable or enable the user,
- * so if that's what we're doing, skip the rest of the checks
- */
- if (!cgi_variable(DISABLE_USER_FLAG) && !cgi_variable(ENABLE_USER_FLAG) && !cgi_variable(DELETE_USER_FLAG)) {
-
- /*
- * If current user is not root, make sure old password has been specified
- * If REMOTE change, even root must provide old password
- */
- if (((!am_root()) && (strlen( cgi_variable_nonull(OLD_PSWD)) <= 0)) ||
- ((cgi_variable(CHG_R_PASSWD_FLAG)) && (strlen( cgi_variable_nonull(OLD_PSWD)) <= 0))) {
- printf("<p>%s\n", _(" Must specify \"Old Password\" "));
- return;
- }
-
- /* If changing a users password on a remote hosts we have to know what host */
- if ((cgi_variable(CHG_R_PASSWD_FLAG)) && (strlen( cgi_variable_nonull(RHOST)) <= 0)) {
- printf("<p>%s\n", _(" Must specify \"Remote Machine\" "));
- return;
- }
-
- /* Make sure new passwords have been specified */
- if ((strlen( cgi_variable_nonull(NEW_PSWD)) <= 0) ||
- (strlen( cgi_variable_nonull(NEW2_PSWD)) <= 0)) {
- printf("<p>%s\n", _(" Must specify \"New, and Re-typed Passwords\" "));
- return;
- }
-
- /* Make sure new passwords was typed correctly twice */
- if (strcmp(cgi_variable_nonull(NEW_PSWD), cgi_variable_nonull(NEW2_PSWD)) != 0) {
- printf("<p>%s\n", _(" Re-typed password didn't match new password "));
- return;
- }
- }
-
- if (cgi_variable(CHG_R_PASSWD_FLAG)) {
- host = cgi_variable(RHOST);
- } else if (am_root()) {
- host = NULL;
- } else {
- host = "127.0.0.1";
- }
-
- /*
- * Set up the local flags.
- */
-
- local_flags |= (cgi_variable(ADD_USER_FLAG) ? LOCAL_ADD_USER : 0);
- local_flags |= (cgi_variable(ADD_USER_FLAG) ? LOCAL_SET_PASSWORD : 0);
- local_flags |= (cgi_variable(CHG_S_PASSWD_FLAG) ? LOCAL_SET_PASSWORD : 0);
- local_flags |= (cgi_variable(DELETE_USER_FLAG) ? LOCAL_DELETE_USER : 0);
- local_flags |= (cgi_variable(ENABLE_USER_FLAG) ? LOCAL_ENABLE_USER : 0);
- local_flags |= (cgi_variable(DISABLE_USER_FLAG) ? LOCAL_DISABLE_USER : 0);
-
- rslt = change_password(host,
- cgi_variable_nonull(SWAT_USER),
- cgi_variable_nonull(OLD_PSWD), cgi_variable_nonull(NEW_PSWD),
- local_flags);
-
- if(cgi_variable(CHG_S_PASSWD_FLAG)) {
- printf("<p>");
- if (rslt == True) {
- printf("%s\n", _(" The passwd has been changed."));
- } else {
- printf("%s\n", _(" The passwd has NOT been changed."));
- }
- }
-
- return;
-}
-
-/****************************************************************************
- display a password editing page
-****************************************************************************/
-static void passwd_page(void)
-{
- const char *new_name = cgi_user_name();
- const char passwd_form[] = "passwd";
- const char rpasswd_form[] = "rpasswd";
-
- if (!new_name) new_name = "";
-
- printf("<H2>%s</H2>\n", _("Server Password Management"));
-
- printf("<FORM name=\"swatform\" method=post>\n");
- print_xsrf_token(cgi_user_name(), cgi_user_pass(), passwd_form);
-
- printf("<table>\n");
-
- /*
- * Create all the dialog boxes for data collection
- */
- printf("<tr><td> %s : </td>\n", _("User Name"));
- printf("<td><input type=text size=30 name=%s value=%s></td></tr> \n", SWAT_USER, new_name);
- if (!am_root()) {
- printf("<tr><td> %s : </td>\n", _("Old Password"));
- printf("<td><input type=password size=30 name=%s></td></tr> \n",OLD_PSWD);
- }
- printf("<tr><td> %s : </td>\n", _("New Password"));
- printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW_PSWD);
- printf("<tr><td> %s : </td>\n", _("Re-type New Password"));
- printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW2_PSWD);
- printf("</table>\n");
-
- /*
- * Create all the control buttons for requesting action
- */
- printf("<input type=submit name=%s value=\"%s\">\n",
- CHG_S_PASSWD_FLAG, _("Change Password"));
- if (demo_mode || am_root()) {
- printf("<input type=submit name=%s value=\"%s\">\n",
- ADD_USER_FLAG, _("Add New User"));
- printf("<input type=submit name=%s value=\"%s\">\n",
- DELETE_USER_FLAG, _("Delete User"));
- printf("<input type=submit name=%s value=\"%s\">\n",
- DISABLE_USER_FLAG, _("Disable User"));
- printf("<input type=submit name=%s value=\"%s\">\n",
- ENABLE_USER_FLAG, _("Enable User"));
- }
- printf("<p></FORM>\n");
-
- /*
- * Do some work if change, add, disable or enable was
- * requested. It could be this is the first time through this
- * code, so there isn't anything to do. */
- if (verify_xsrf_token(passwd_form) &&
- ((cgi_variable(CHG_S_PASSWD_FLAG)) || (cgi_variable(ADD_USER_FLAG)) || (cgi_variable(DELETE_USER_FLAG)) ||
- (cgi_variable(DISABLE_USER_FLAG)) || (cgi_variable(ENABLE_USER_FLAG)))) {
- chg_passwd();
- }
-
- printf("<H2>%s</H2>\n", _("Client/Server Password Management"));
-
- printf("<FORM name=\"swatform\" method=post>\n");
- print_xsrf_token(cgi_user_name(), cgi_user_pass(), rpasswd_form);
-
- printf("<table>\n");
-
- /*
- * Create all the dialog boxes for data collection
- */
- printf("<tr><td> %s : </td>\n", _("User Name"));
- printf("<td><input type=text size=30 name=%s value=%s></td></tr>\n",SWAT_USER, new_name);
- printf("<tr><td> %s : </td>\n", _("Old Password"));
- printf("<td><input type=password size=30 name=%s></td></tr>\n",OLD_PSWD);
- printf("<tr><td> %s : </td>\n", _("New Password"));
- printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW_PSWD);
- printf("<tr><td> %s : </td>\n", _("Re-type New Password"));
- printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW2_PSWD);
- printf("<tr><td> %s : </td>\n", _("Remote Machine"));
- printf("<td><input type=text size=30 name=%s></td></tr>\n",RHOST);
-
- printf("</table>");
-
- /*
- * Create all the control buttons for requesting action
- */
- printf("<input type=submit name=%s value=\"%s\">",
- CHG_R_PASSWD_FLAG, _("Change Password"));
-
- printf("<p></FORM>\n");
-
- /*
- * Do some work if a request has been made to change the
- * password somewhere other than the server. It could be this
- * is the first time through this code, so there isn't
- * anything to do. */
- if (verify_xsrf_token(passwd_form) && cgi_variable(CHG_R_PASSWD_FLAG)) {
- chg_passwd();
- }
-
-}
-
-/****************************************************************************
- display a printers editing page
-****************************************************************************/
-static void printers_page(void)
-{
- const char *share = cgi_variable("share");
- char *s;
- int snum=-1;
- int i;
- int mode = 0;
- unsigned int parm_filter = FLAG_BASIC;
- const char form_name[] = "printers";
-
- if (!verify_xsrf_token(form_name)) {
- goto output_page;
- }
-
- if (share)
- snum = lp_servicenumber(share);
-
- if (cgi_variable("Commit") && snum >= 0) {
- commit_parameters(snum);
- if (snum >= iNumNonAutoPrintServices)
- save_reload(snum);
- else
- save_reload(-1);
- snum = lp_servicenumber(share);
- }
-
- if (cgi_variable("Delete") && snum >= 0) {
- lp_remove_service(snum);
- save_reload(-1);
- share = NULL;
- snum = -1;
- }
-
- if (cgi_variable("createshare") && (share=cgi_variable("newshare"))) {
- snum = lp_servicenumber(share);
- if (snum < 0 || snum >= iNumNonAutoPrintServices) {
- load_config(False);
- lp_copy_service(GLOBAL_SECTION_SNUM, share);
- snum = lp_servicenumber(share);
- lp_do_parameter(snum, "print ok", "Yes");
- save_reload(snum);
- snum = lp_servicenumber(share);
- }
- }
-
- if ( cgi_variable("ViewMode") )
- mode = atoi(cgi_variable_nonull("ViewMode"));
- if ( cgi_variable("BasicMode"))
- mode = 0;
- if ( cgi_variable("AdvMode"))
- mode = 1;
-
-output_page:
- printf("<H2>%s</H2>\n", _("Printer Parameters"));
-
- printf("<H3>%s</H3>\n", _("Important Note:"));
- printf("%s",_("Printer names marked with [*] in the Choose Printer drop-down box "));
- printf("%s",_("are autoloaded printers from "));
- printf("<A HREF=\"/swat/help/smb.conf.5.html#printcapname\" target=\"docs\">%s</A>\n", _("Printcap Name"));
- printf("%s\n", _("Attempting to delete these printers from SWAT will have no effect."));
-
-
- printf("<FORM name=\"swatform\" method=post>\n");
- print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name);
-
- ViewModeBoxes( mode );
- switch ( mode ) {
- case 0:
- parm_filter = FLAG_BASIC;
- break;
- case 1:
- parm_filter = FLAG_ADVANCED;
- break;
- }
- printf("<table>\n");
- printf("<tr><td><input type=submit name=\"selectshare\" value=\"%s\"></td>\n", _("Choose Printer"));
- printf("<td><select name=\"share\">\n");
- if (snum < 0 || !lp_print_ok(snum))
- printf("<option value=\" \"> \n");
- for (i=0;i<lp_numservices();i++) {
- s = lp_servicename(talloc_tos(), i);
- if (s && (*s) && strcmp(s,"IPC$") && lp_print_ok(i)) {
- if (i >= iNumNonAutoPrintServices)
- printf("<option %s value=\"%s\">[*]%s\n",
- (share && strcmp(share,s)==0)?"SELECTED":"",
- s, s);
- else
- printf("<option %s value=\"%s\">%s\n",
- (share && strcmp(share,s)==0)?"SELECTED":"",
- s, s);
- }
- }
- printf("</select></td>");
- if (have_write_access) {
- printf("<td><input type=submit name=\"Delete\" value=\"%s\"></td>\n", _("Delete Printer"));
- }
- printf("</tr>");
- printf("</table>\n");
-
- if (have_write_access) {
- printf("<table>\n");
- printf("<tr><td><input type=submit name=\"createshare\" value=\"%s\"></td>\n", _("Create Printer"));
- printf("<td><input type=text size=30 name=\"newshare\"></td></tr>\n");
- printf("</table>");
- }
-
-
- if (snum >= 0) {
- if (have_write_access) {
- printf("<input type=submit name=\"Commit\" value=\"%s\">\n", _("Commit Changes"));
- }
- printf("<input type=reset name=\"Reset Values\" value=\"%s\">\n", _("Reset Values"));
- printf("<p>\n");
- }
-
- if (snum >= 0) {
- printf("<table>\n");
- show_parameters(snum, 1, parm_filter, 1);
- printf("</table>\n");
- }
- printf("</FORM>\n");
-}
-
-/*
- when the _() translation macro is used there is no obvious place to free
- the resulting string and there is no easy way to give a static pointer.
- All we can do is rotate between some static buffers and hope a single d_printf()
- doesn't have more calls to _() than the number of buffers
-*/
-
-const char *lang_msg_rotate(TALLOC_CTX *ctx, const char *msgid)
-{
- const char *msgstr;
- const char *ret;
-
- msgstr = lang_msg(msgid);
- if (!msgstr) {
- return msgid;
- }
-
- ret = talloc_strdup(ctx, msgstr);
-
- lang_msg_free(msgstr);
- if (!ret) {
- return msgid;
- }
-
- return ret;
-}
-
-/**
- * main function for SWAT.
- **/
- int main(int argc, char *argv[])
-{
- const char *page;
- poptContext pc;
- struct poptOption long_options[] = {
- POPT_AUTOHELP
- { "disable-authentication", 'a', POPT_ARG_VAL, &demo_mode, True, "Disable authentication (demo mode)" },
- { "password-menu-only", 'P', POPT_ARG_VAL, &passwd_only, True, "Show only change password menu" },
- POPT_COMMON_SAMBA
- POPT_TABLEEND
- };
- TALLOC_CTX *frame = talloc_stackframe();
-
- fault_setup();
- umask(S_IWGRP | S_IWOTH);
-
-#if defined(HAVE_SET_AUTH_PARAMETERS)
- set_auth_parameters(argc, argv);
-#endif /* HAVE_SET_AUTH_PARAMETERS */
-
- /* just in case it goes wild ... */
- alarm(300);
-
- setlinebuf(stdout);
-
- /* we don't want any SIGPIPE messages */
- BlockSignals(True,SIGPIPE);
-
- debug_set_logfile("/dev/null");
-
- /* we don't want stderr screwing us up */
- close(2);
- open("/dev/null", O_WRONLY);
- setup_logging("swat", DEBUG_FILE);
-
- load_case_tables();
-
- pc = poptGetContext("swat", argc, (const char **) argv, long_options, 0);
-
- /* Parse command line options */
-
- while(poptGetNextOpt(pc) != -1) { }
-
- poptFreeContext(pc);
-
- /* This should set a more apporiate log file */
- load_config(True);
- reopen_logs();
- load_interfaces();
- iNumNonAutoPrintServices = lp_numservices();
- if (pcap_cache_loaded()) {
- struct tevent_context *ev_ctx;
- struct messaging_context *msg_ctx;
-
- ev_ctx = s3_tevent_context_init(NULL);
- if (ev_ctx == NULL) {
- printf("s3_tevent_context_init() failed\n");
- return 0;
- }
- msg_ctx = messaging_init(ev_ctx, ev_ctx);
- if (msg_ctx == NULL) {
- printf("messaging_init() failed\n");
- return 0;
- }
-
- load_printers(ev_ctx, msg_ctx);
-
- talloc_free(ev_ctx);
- }
-
- cgi_setup(get_dyn_SWATDIR(), !demo_mode);
-
- print_header();
-
- cgi_load_variables();
-
- if (!file_exist(get_dyn_CONFIGFILE())) {
- have_read_access = True;
- have_write_access = True;
- } else {
- /* check if the authenticated user has write access - if not then
- don't show write options */
- have_write_access = (access(get_dyn_CONFIGFILE(),W_OK) == 0);
-
- /* if the user doesn't have read access to smb.conf then
- don't let them view it */
- have_read_access = (access(get_dyn_CONFIGFILE(),R_OK) == 0);
- }
-
- show_main_buttons();
-
- page = cgi_pathinfo();
-
- /* Root gets full functionality */
- if (have_read_access && strcmp(page, "globals")==0) {
- globals_page();
- } else if (have_read_access && strcmp(page,"shares")==0) {
- shares_page();
- } else if (have_read_access && strcmp(page,"printers")==0) {
- printers_page();
- } else if (have_read_access && strcmp(page,"status")==0) {
- status_page();
- } else if (have_read_access && strcmp(page,"viewconfig")==0) {
- viewconfig_page();
- } else if (strcmp(page,"passwd")==0) {
- passwd_page();
- } else if (have_read_access && strcmp(page,"wizard")==0) {
- wizard_page();
- } else if (have_read_access && strcmp(page,"wizard_params")==0) {
- wizard_params_page();
- } else if (have_read_access && strcmp(page,"rewritecfg")==0) {
- rewritecfg_file();
- } else {
- welcome_page();
- }
-
- print_footer();
-
- TALLOC_FREE(frame);
- return 0;
-}
-
-/** @} **/
diff --git a/source3/web/swat_proto.h b/source3/web/swat_proto.h
deleted file mode 100644
index 424a3af545..0000000000
--- a/source3/web/swat_proto.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Unix SMB/CIFS implementation.
- * collected prototypes header
- *
- * frozen from "make proto" in May 2008
- *
- * Copyright (C) Michael Adam 2008
- *
- * 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/>.
- */
-
-#ifndef _SWAT_PROTO_H_
-#define _SWAT_PROTO_H_
-
-
-/* The following definitions come from web/cgi.c */
-
-void cgi_load_variables(void);
-const char *cgi_variable(const char *name);
-const char *cgi_variable_nonull(const char *name);
-bool am_root(void);
-char *cgi_user_name(void);
-char *cgi_user_pass(void);
-void cgi_setup(const char *rootdir, int auth_required);
-const char *cgi_baseurl(void);
-const char *cgi_pathinfo(void);
-const char *cgi_remote_host(void);
-const char *cgi_remote_addr(void);
-bool cgi_waspost(void);
-
-/* The following definitions come from web/diagnose.c */
-
-bool winbindd_running(void);
-bool nmbd_running(void);
-bool smbd_running(void);
-
-/* The following definitions come from web/neg_lang.c */
-
-int web_open(const char *fname, int flags, mode_t mode);
-void web_set_lang(const char *lang_string);
-
-/* The following definitions come from web/startstop.c */
-
-void start_smbd(void);
-void start_nmbd(void);
-void start_winbindd(void);
-void stop_smbd(void);
-void stop_nmbd(void);
-void stop_winbindd(void);
-void kill_pid(struct server_id pid);
-
-/* The following definitions come from web/statuspage.c */
-
-void status_page(void);
-
-/* The following definitions come from web/swat.c */
-
-const char *lang_msg_rotate(TALLOC_CTX *ctx, const char *msgid);
-void get_xsrf_token(const char *username, const char *pass,
- const char *formname, time_t xsrf_time, char token_str[33]);
-void print_xsrf_token(const char *username, const char *pass,
- const char *formname);
-bool verify_xsrf_token(const char *formname);
-
-#endif /* _SWAT_PROTO_H_ */
diff --git a/source3/wscript b/source3/wscript
index 280a51f50e..dba6cdc869 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -23,7 +23,6 @@ def set_options(opt):
action="store", dest='shared_modules', default=None)
opt.SAMBA3_ADD_OPTION('winbind')
- opt.SAMBA3_ADD_OPTION('swat')
opt.SAMBA3_ADD_OPTION('ads', default=None) # None means autodetection
opt.SAMBA3_ADD_OPTION('ldap')
opt.SAMBA3_ADD_OPTION('cups', with_name="enable", without_name="disable")
@@ -72,9 +71,6 @@ def configure(conf):
conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD')
conf.env.developer = True
- if Options.options.with_swat:
- conf.env['build_swat'] = True
-
if sys.platform != 'openbsd5':
conf.ADD_LDFLAGS("-Wl,--export-dynamic", testflags=True)
diff --git a/source3/wscript_build b/source3/wscript_build
index c222de7dbe..0a85653231 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -421,11 +421,6 @@ NMBD_SRC1 = '''nmbd/asyncdns.c nmbd/nmbd.c nmbd/nmbd_become_dmb.c
NMBD_SRC = '${NMBD_SRC1}'
-SWAT_SRC1 = '''web/cgi.c web/diagnose.c web/startstop.c web/statuspage.c
- web/swat.c web/neg_lang.c'''
-
-SWAT_SRC = '''${SWAT_SRC1}'''
-
STATUS_SRC = '''utils/status.c utils/status_profile.c smbd/notify_internal.c'''
SMBCONTROL_SRC = '''utils/smbcontrol.c'''
@@ -1221,27 +1216,6 @@ bld.SAMBA3_BINARY('winbindd/winbindd',
install_path='${SBINDIR}',
vars=locals())
-bld.SAMBA3_BINARY('web/swat',
- source=SWAT_SRC,
- deps='''
- talloc
- tevent
- samba3core
- libsmb
- param
- pdb
- popt_samba3
- smbd_base
- LOCKING
- PLAINTEXT_AUTH
- PASSCHANGE
- PRINTBASE
- PRINTING
- ''',
- enabled=bld.env.build_swat,
- install_path='${SBINDIR}',
- vars=locals())
-
bld.SAMBA3_BINARY('rpcclient/rpcclient',
source=RPCCLIENT_SRC,
deps='''
@@ -1650,13 +1624,6 @@ bld.SAMBA3_BINARY('regedit',
enabled=bld.env.build_regedit,
vars=locals())
-swat_dir = os.path.join(bld.curdir, '../swat')
-swat_files = recursive_dirlist(swat_dir, swat_dir, '*')
-swat_msg_dir = os.path.join(bld.curdir, 'po')
-swat_msg_files = recursive_dirlist(swat_msg_dir, swat_msg_dir, '*.msg')
-bld.INSTALL_FILES('${SWATDIR}', swat_files, base_name='../swat')
-bld.INSTALL_FILES('${CODEPAGEDIR}', swat_msg_files, base_name='po')
-
########################## INCLUDES #################################
bld.RECURSE('auth')
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 193d504408..5fb252e93d 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -260,7 +260,6 @@ static void show_build(void)
CONFIG_OPTION(CACHEDIR),
CONFIG_OPTION(PIDDIR),
CONFIG_OPTION(PRIVATE_DIR),
- CONFIG_OPTION(SWATDIR),
CONFIG_OPTION(CODEPAGEDIR),
CONFIG_OPTION(SETUPDIR),
CONFIG_OPTION(WINBINDD_SOCKET_DIR),
diff --git a/swat/help/welcome-no-samba-doc.html b/swat/help/welcome-no-samba-doc.html
deleted file mode 100644
index 67d7bb3ae5..0000000000
--- a/swat/help/welcome-no-samba-doc.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<h3>Welcome to SWAT!</h3>
-
-More documentation is available at this point if you install the <b>samba-doc</b> package.
diff --git a/swat/help/welcome.html b/swat/help/welcome.html
deleted file mode 100644
index 5f7379388c..0000000000
--- a/swat/help/welcome.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<h3>Welcome to SWAT!</h3>
-
-Please choose a configuration action using one of the above buttons
-
-<h3><a href="/swat/help/manpages/samba.7.html" target="docs">Samba</a> Documentation</h3>
-
-<ul>
- <li><b>Daemons</b>
- <ul>
- <li><a href="/swat/help/manpages/smbd.8.html" target="docs">smbd</a> - the SMB daemon
- <li><a href="/swat/help/manpages/nmbd.8.html" target="docs">nmbd</a> - the NetBIOS nameserver
- <li><a href="/swat/help/manpages/winbindd.8.html" target="docs">winbindd</a> - the winbind daemon
- </ul>
- <li><b>Configuration Files</b>
- <ul>
- <li><a href="/swat/help/manpages/smb.conf.5.html" target="docs">smb.conf</a> - the main Samba configuration file
- <li><a href="/swat/help/manpages/lmhosts.5.html" target="docs">lmhosts</a> - NetBIOS hosts file
- <li><a href="/swat/help/manpages/smbpasswd.5.html" target="docs">smbpasswd</a> - SMB password file
- </ul>
- <li><b>Administrative Utilities</b>
- <ul>
- <li><a href="/swat/help/manpages/smbcontrol.1.html" target="docs">smbcontrol</a> - send control messages to Samba daemons
- <li><a href="/swat/help/manpages/smbpasswd.8.html" target="docs">smbpasswd</a> - managing SMB passwords
- <li><a href="/swat/help/manpages/swat.8.html" target="docs">SWAT</a> - web configuration tool
- <li><a href="/swat/help/manpages/net.8.html" target="docs">net</a> - tool for administration of Samba and remote CIFS servers
- <li><a href="/swat/help/manpages/pdbedit.8.html" target="docs">pdbedit</a> - Samba user account management tool
- <li><a href="/swat/help/manpages/tdbbackup.8.html" target="docs">tdbbackup</a> - Tool for backing up TDB databases
- </ul>
- <li><b>Client Tools</b>
- <ul>
- <li><a href="/swat/help/manpages/rpcclient.1.html" target="docs">rpcclient</a> - command line MS-RPC client
- <li><a href="/swat/help/manpages/smbtar.1.html" target="docs">smbtar</a> - SMB backup tool
- <li><a href="/swat/help/manpages/smbclient.1.html" target="docs">smbclient</a> - command line SMB client
- <li><a href="/swat/help/manpages/ntlm_auth.1.html" target="docs">ntlm_auth</a> - allow external programs to use NTLM authentication
- <li><a href="/swat/help/manpages/smbcquotas.1.html" target="docs">smbcquotas</a> - get or set quotas on NTFS 5 shares
- <li><a href="/swat/help/manpages/smbspool.8.html" target="docs">smbspool</a> - Send a print job to an SMB printer
- <li><a href="/swat/help/manpages/smbtree.1.html" target="docs">smbtree</a> - Text-based SMB network browsing
- </ul>
- <li><b>Diagnostic Utilities</b>
- <ul>
- <li><a href="/swat/help/manpages/smbstatus.1.html" target="docs">smbstatus</a> - monitoring Samba
- <li><a href="/swat/help/manpages/testparm.1.html" target="docs">testparm</a> - validating your config file
- <li><a href="/swat/help/manpages/nmblookup.1.html" target="docs">nmblookup</a> - NetBIOS name query tool
- <li><a href="/swat/help/manpages/wbinfo.1.html" target="docs">wbinfo</a> - Tool for getting winbind information
- </ul>
- <li><b>Misc. Utilities</b>
- <ul>
- <li><a href="/swat/help/manpages/profiles.1.html" target="docs">profiles</a> - migrating profiles from one domain to another
- <li><a href="/swat/help/manpages/log2pcap.1.html" target="docs">log2pcap</a> - generate pcap files from samba log files
- </ul>
- <li><b>Books</b>
- <ul>
- <li><a href="/swat/help/using_samba/toc.html" target="docs">Using Samba, 2ed.</a> - by Jay Ts, Robert Eckstein, and David Collier-Brown
- <li><a href="/swat/help/Samba3-HOWTO/" target="docs">The Official Samba HOWTO and Reference Guide</a>
- <li><a href="/swat/help/Samba3-ByExample/" target="docs">Samba 3 by Example</a>
- <li><a href="/swat/help/Samba3-Developers-Guide/" target="docs">The Samba Developer Guide</a>
- </ul>
-</ul>
-
- <h3>Feedback</h3>
-
- Please join the <A HREF="http://lists.samba.org/">samba</A> mailing
- list if you want to discuss issues with this release of SWAT.
diff --git a/swat/images/globals.gif b/swat/images/globals.gif
deleted file mode 100644
index 7a9a8510d7..0000000000
--- a/swat/images/globals.gif
+++ /dev/null
Binary files differ
diff --git a/swat/images/home.gif b/swat/images/home.gif
deleted file mode 100644
index 84b1dd032f..0000000000
--- a/swat/images/home.gif
+++ /dev/null
Binary files differ
diff --git a/swat/images/passwd.gif b/swat/images/passwd.gif
deleted file mode 100644
index 17393a1402..0000000000
--- a/swat/images/passwd.gif
+++ /dev/null
Binary files differ
diff --git a/swat/images/printers.gif b/swat/images/printers.gif
deleted file mode 100644
index db9ec3f0e0..0000000000
--- a/swat/images/printers.gif
+++ /dev/null
Binary files differ
diff --git a/swat/images/samba.gif b/swat/images/samba.gif
deleted file mode 100644
index 3ec3d2195f..0000000000
--- a/swat/images/samba.gif
+++ /dev/null
Binary files differ
diff --git a/swat/images/shares.gif b/swat/images/shares.gif
deleted file mode 100644
index b3af15e35d..0000000000
--- a/swat/images/shares.gif
+++ /dev/null
Binary files differ
diff --git a/swat/images/status.gif b/swat/images/status.gif
deleted file mode 100644
index 81ef0bcf16..0000000000
--- a/swat/images/status.gif
+++ /dev/null
Binary files differ
diff --git a/swat/images/viewconfig.gif b/swat/images/viewconfig.gif
deleted file mode 100644
index bdeac1cf96..0000000000
--- a/swat/images/viewconfig.gif
+++ /dev/null
Binary files differ
diff --git a/swat/images/wizard.gif b/swat/images/wizard.gif
deleted file mode 100644
index a4614e936b..0000000000
--- a/swat/images/wizard.gif
+++ /dev/null
Binary files differ
diff --git a/swat/include/footer.html b/swat/include/footer.html
deleted file mode 100644
index 7c3b483684..0000000000
--- a/swat/include/footer.html
+++ /dev/null
@@ -1,3 +0,0 @@
-</TD></TR></TABLE></CENTER>
-</BODY>
-</HTML>
diff --git a/swat/include/header.html b/swat/include/header.html
deleted file mode 100644
index c482aedcb8..0000000000
--- a/swat/include/header.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<HTML>
-<HEAD>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<TITLE>Samba Web Administration Tool</TITLE>
-</HEAD>
-<BODY bgcolor="white">
-<CENTER>
-<IMG SRC="/swat/images/samba.gif" ALT="[ Samba ]" border=0><BR>
-<TABLE WIDTH="98%" CELLSPACING=1 CELLPADDING=4 BORDER=1>
-<TR><TD BGCOLOR="#ddddd0">
diff --git a/swat/lang/ja/help/welcome.html b/swat/lang/ja/help/welcome.html
deleted file mode 100644
index 01d3f78745..0000000000
--- a/swat/lang/ja/help/welcome.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<h3>SWAT へようこそ!</h3>
-
-上のボタンをクリックして設定を行ってください。
-
-<h3><a href="/swat/help/samba.7.html" target="docs">Samba</a> ドキュメント</h3>
-
-<ul>
- <li><b>デーモン</b>
- <ul>
- <li><a href="/swat/help/smbd.8.html" target="docs">smbd</a> - SMB デーモン
- <li><a href="/swat/help/nmbd.8.html" target="docs">nmbd</a> - NetBIOS ネームサーバ
- <li><a href="/swat/help/winbindd.8.html" target="docs">winbindd</a> - winbind デーモン
- </ul>
- <li><b>設定ファイル</b>
- <ul>
- <li><a href="/swat/help/smb.conf.5.html" target="docs">smb.conf</a> - Samba 設定ファイル
- <li><a href="/swat/help/lmhosts.5.html" target="docs">lmhosts</a> - NetBIOS の hosts ファイル
- <li><a href="/swat/help/smbpasswd.5.html" target="docs">smbpasswd</a> - SMB パスワードファイル
- </ul>
- <li><b>管理ユーティリティ</b>
- <ul>
- <li><a href="/swat/help/smbcontrol.1.html" target="docs">smbcontrol</a> - Samba デーモンへのコントロールメッセージの送出
- <li><a href="/swat/help/smbpasswd.8.html" target="docs">smbpasswd</a> - SMB パスワードの管理
- <li><a href="/swat/help/swat.8.html" target="docs">SWAT</a> - Web 設定ツール
- <li><a href="/swat/help/net.8.html" target="docs">net</a> - Samba およびリモートの CIFS サーバの管理ツール
- <li><a href="/swat/help/pdbedit.8.html" target="docs">pdbedit</a> - Samba のユーザアカウント管理ツール
- <li><a href="/swat/help/tdbbackup.8.html" target="docs">tdbbackup</a> - TDB データベースのバックアップツール
- </ul>
- <li><b>クライアントツール</b>
- <ul>
- <li><a href="/swat/help/rpcclient.1.html" target="docs">rpcclient</a> - コマンドラインの MS-RPC クライアント
- <li><a href="/swat/help/smbtar.1.html" target="docs">smbtar</a> - SMB バックアップツール
- <li><a href="/swat/help/smbclient.1.html" target="docs">smbclient</a> - コマンドラインの SMB クライアント
- <li><a href="/swat/help/smbspool.8.html" target="docs">smbspool</a> - コマンドラインの SMB 印刷クライアント
- <li><a href="/swat/help/ntlm_auth.1.html" target="docs">ntlm_auth</a> - 別プログラムからの NTLM 認証の使用を実現
- <li><a href="/swat/help/smbcquotas.1.html" target="docs">smbcquotas</a> - NTFS 5 共有のクォータ情報の設定と取得
- <li><a href="/swat/help/smbsh.1.html" target="docs">smbsh</a> - UNIX シェルを用いたリモート SMB 共有へのアクセスを実現
- <li><a href="/swat/help/smbtree.1.html" target="docs">smbtree</a> - テキストベースの SMB ネットワークブラウジング
- <li><a href="/swat/help/smbspool.8.html" target="docs">smbspool</a> - 印刷ジョブを SMB プリンタに送信
- </ul>
- <li><b>診断ユーティリティ</b>
- <ul>
- <li><a href="/swat/help/smbstatus.1.html" target="docs">smbstatus</a> - Samba の監視
- <li><a href="/swat/help/testparm.1.html" target="docs">testparm</a> - 設定ファイルの整合性の検査
- <li><a href="/swat/help/testprns.1.html" target="docs">testprns</a> - プリンタ設定の検査
- <li><a href="/swat/help/nmblookup.1.html" target="docs">nmblookup</a> - NetBIOS 名の検索ツール
- <li><a href="/swat/help/wbinfo.1.html" target="docs">wbinfo</a> - winbind 情報の取得ツール
- </ul>
- <li><b>その他のユーティリティ</b>
- <ul>
- <li><a href="/swat/help/profiles.1.html" target="docs">profiles</a> - 別ドメインへのプロファイルの移行
- <li><a href="/swat/help/editreg.1.html" target="docs">editreg</a> - Windows レジストリファイルの編集
- <li><a href="/swat/help/log2pcap.1.html" target="docs">log2pcap</a> - Samba のログファイルから pcap ファイルの生成
- </ul>
- <li><b>書籍</b>
- <ul>
- <li><a href="/swat/using_samba/toc.html" target="docs">Using Samba 第二版</a> - 著者: Jay Ts, Robert Eckstein, David Collier-Brown
- <li><a href="/swat/help/Samba-HOWTO-Collection.html">Samba HOWTO コレクション</a>
- </ul>
-</ul>
-
- <h3>フィードバック</h3>
-
- このバージョンの SWAT に関する問題についての議論を行ないたい方は、
- <A HREF="http://lists.samba.org/">samba</A> メーリングリストへの参加をお願いします。
-<small>(もしくは <A HREF="http://www.samba.gr.jp/ml/">sugj-tech</A> メーリングリストに日本語でお願いします)</small>
diff --git a/swat/lang/ru/help/welcome-no-samba-doc.html b/swat/lang/ru/help/welcome-no-samba-doc.html
deleted file mode 100644
index 335560ffed..0000000000
--- a/swat/lang/ru/help/welcome-no-samba-doc.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<h3>Добро пожаловать в SWAT!</h3>
-<!--
-samba-3.0.25a-2
---!>
-
-Здесь будут ссылки на документацию, если вы установите пакет <b>samba-doc</b>.
diff --git a/swat/lang/ru/help/welcome.html b/swat/lang/ru/help/welcome.html
deleted file mode 100644
index 0e4b2c1273..0000000000
--- a/swat/lang/ru/help/welcome.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<h3>Добро пожаловать в SWAT!</h3>
-<!--
-samba-3.0.25a-2
---!>
-
-С помощью кнопок, расположенных выше, перейдите к желаемому действию
-
-<h3><a href="/swat/help/manpages/samba.7.html" target="docs">Samba</a> Документация</h3>
-
-<ul>
- <li><b>Демоны</b>
- <ul>
- <li><a href="/swat/help/manpages/smbd.8.html" target="docs">smbd</a> - демон SMB
- <li><a href="/swat/help/manpages/nmbd.8.html" target="docs">nmbd</a> - сервер имён NetBIOS
- <li><a href="/swat/help/manpages/winbindd.8.html" target="docs">winbindd</a> - демон winbind
- </ul>
- <li><b>Файлы конфигурации</b>
- <ul>
- <li><a href="/swat/help/manpages/smb.conf.5.html" target="docs">smb.conf</a> - главный файл конфигурации Samba
- <li><a href="/swat/help/manpages/lmhosts.5.html" target="docs">lmhosts</a> - файл хостов NetBIOS
- <li><a href="/swat/help/manpages/smbpasswd.5.html" target="docs">smbpasswd</a> - файл паролей SMB
- </ul>
- <li><b>Утилиты администрирования</b>
- <ul>
- <li><a href="/swat/help/manpages/smbcontrol.1.html" target="docs">smbcontrol</a> - отправка управляющих сообщение демонам Samba
- <li><a href="/swat/help/manpages/smbpasswd.8.html" target="docs">smbpasswd</a> - управление паролями SMB
- <li><a href="/swat/help/manpages/swat.8.html" target="docs">SWAT</a> - инструмент настройки через веб
- <li><a href="/swat/help/manpages/net.8.html" target="docs">net</a> - инструмент администрирования Samba и удалённых серверов CIFS
- <li><a href="/swat/help/manpages/pdbedit.8.html" target="docs">pdbedit</a> - инструмент управления учётными записями Samba
- <li><a href="/swat/help/manpages/tdbbackup.8.html" target="docs">tdbbackup</a> - инструмент резервного копирования баз данных TDB
- </ul>
- <li><b>Клиентские утилиты</b>
- <ul>
- <li><a href="/swat/help/manpages/rpcclient.1.html" target="docs">rpcclient</a> - клиент MS-RPC с интерфейсом командной строки
- <li><a href="/swat/help/manpages/smbtar.1.html" target="docs">smbtar</a> - инструмент резервного копирования SMB
- <li><a href="/swat/help/manpages/smbclient.1.html" target="docs">smbclient</a> - клиент SMB с интерфейсом командной строки
- <li><a href="/swat/help/manpages/ntlm_auth.1.html" target="docs">ntlm_auth</a> - позволяет внешним программам использовать аутентификацию NTLM
- <li><a href="/swat/help/manpages/smbcquotas.1.html" target="docs">smbcquotas</a> - запрашивает или устанавливает квоты ресурсов на NTFS 5
- <li><a href="/swat/help/manpages/smbspool.8.html" target="docs">smbspool</a> - отправляет задание на печать через SMB-принтер
- <li><a href="/swat/help/manpages/smbtree.1.html" target="docs">smbtree</a> - отображение сети SMB в текстовом виде
- </ul>
- <li><b>Утилиты диагностики</b>
- <ul>
- <li><a href="/swat/help/manpages/smbstatus.1.html" target="docs">smbstatus</a> - мониторинг Samba
- <li><a href="/swat/help/manpages/testparm.1.html" target="docs">testparm</a> - проверка правильности конфигурационного файла
- <li><a href="/swat/help/manpages/nmblookup.1.html" target="docs">nmblookup</a> - инструмент для поиска имён NetBIOS
- <li><a href="/swat/help/manpages/wbinfo.1.html" target="docs">wbinfo</a> - инструмент для получения информации о winbind
- </ul>
- <li><b>Различные утилиты</b>
- <ul>
- <li><a href="/swat/help/manpages/profiles.1.html" target="docs">profiles</a> - перевод профилей из одного домена в другой
- <li><a href="/swat/help/manpages/log2pcap.1.html" target="docs">log2pcap</a> - создание файлов pcap из журнальных файлов samba
- </ul>
- <li><b>Книги</b>
- <ul>
- <li><a href="/swat/help/using_samba/toc.html" target="docs">Использование Samba, 2-я редакция</a> - Джей Тс (Jay Ts), Роберт Экштейн (Robert Eckstein) и Дэвид Колье-Браун (David Collier-Brown)
- <li><a href="/swat/help/Samba3-HOWTO/" target="docs">Официальный Samba HOWTO и справочное руководство</a>
- <li><a href="/swat/help/Samba3-ByExample/" target="docs">Samba 3 на примерах</a>
- <li><a href="/swat/help/Samba3-Developers-Guide/" target="docs">Руководство разработчика Samba</a>
- </ul>
-</ul>
-
- <h3>Обратная связь</h3>
-
- Если у вас возникли проблемы с этой версией SWAT, обращайтесь в список рассылки <A HREF="http://lists.samba.org/">samba</A>.
diff --git a/swat/lang/ru/images/globals.gif b/swat/lang/ru/images/globals.gif
deleted file mode 100644
index f7b27b5831..0000000000
--- a/swat/lang/ru/images/globals.gif
+++ /dev/null
Binary files differ
diff --git a/swat/lang/ru/images/home.gif b/swat/lang/ru/images/home.gif
deleted file mode 100644
index c0bc64a465..0000000000
--- a/swat/lang/ru/images/home.gif
+++ /dev/null
Binary files differ
diff --git a/swat/lang/ru/images/passwd.gif b/swat/lang/ru/images/passwd.gif
deleted file mode 100644
index f0e36fc710..0000000000
--- a/swat/lang/ru/images/passwd.gif
+++ /dev/null
Binary files differ
diff --git a/swat/lang/ru/images/printers.gif b/swat/lang/ru/images/printers.gif
deleted file mode 100644
index 570d554645..0000000000
--- a/swat/lang/ru/images/printers.gif
+++ /dev/null
Binary files differ
diff --git a/swat/lang/ru/images/shares.gif b/swat/lang/ru/images/shares.gif
deleted file mode 100644
index 9b106f5caa..0000000000
--- a/swat/lang/ru/images/shares.gif
+++ /dev/null
Binary files differ
diff --git a/swat/lang/ru/images/status.gif b/swat/lang/ru/images/status.gif
deleted file mode 100644
index 8b71e6582e..0000000000
--- a/swat/lang/ru/images/status.gif
+++ /dev/null
Binary files differ
diff --git a/swat/lang/ru/images/viewconfig.gif b/swat/lang/ru/images/viewconfig.gif
deleted file mode 100644
index b80b40866b..0000000000
--- a/swat/lang/ru/images/viewconfig.gif
+++ /dev/null
Binary files differ
diff --git a/swat/lang/ru/images/wizard.gif b/swat/lang/ru/images/wizard.gif
deleted file mode 100644
index 1e74dd48ab..0000000000
--- a/swat/lang/ru/images/wizard.gif
+++ /dev/null
Binary files differ
diff --git a/swat/lang/ru/include/header.html b/swat/lang/ru/include/header.html
deleted file mode 100644
index cfe53cbd3b..0000000000
--- a/swat/lang/ru/include/header.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<HTML>
-<!--
-samba-3.0.25a-2
---!>
-<HEAD>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<TITLE>Утилита администрирования Samba</TITLE>
-</HEAD>
-<BODY bgcolor="white">
-<CENTER>
-<IMG SRC="/swat/images/samba.gif" ALT="[ Samba ]" border=0><BR>
-<TABLE WIDTH="98%" CELLSPACING=1 CELLPADDING=4 BORDER=1>
-<TR><TD BGCOLOR="#ddddd0">
diff --git a/swat/lang/tr/help/welcome.html b/swat/lang/tr/help/welcome.html
deleted file mode 100644
index bc0d584d94..0000000000
--- a/swat/lang/tr/help/welcome.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<h3>Swat'a Hoşgeldiniz!</h3>
-
-Yukarıdaki düğmelerden birini kullanarak bir ayar eylemi seçin.
-
-<h3><a href="/swat/help/samba.7.html" target="docs">Samba</a> Dökümantasyon</h3>
-
-<ul>
- <li><b>Sunucular</b>
- <ul>
- <li><a href="/swat/help/smbd.8.html" target="docs">smbd</a> - SMB sunucusu
- <li><a href="/swat/help/nmbd.8.html" target="docs">nmbd</a> - NetBIOS isim sunucusu
- <li><a href="/swat/help/winbindd.8.html" target="docs">winbindd</a> - winbind sunucusu
- </ul>
- <li><b>Ayar dosyaları</b>
- <ul>
- <li><a href="/swat/help/smb.conf.5.html" target="docs">smb.conf</a> - ana Samba ayar dosyası
- <li><a href="/swat/help/lmhosts.5.html" target="docs">lmhosts</a> - NetBIOS hosts dosyası
- <li><a href="/swat/help/smbpasswd.5.html" target="docs">smbpasswd</a> - SMB şifre dosyası
- </ul>
- <li><b>Yönetim Araçları</b>
- <ul>
- <li><a href="/swat/help/smbcontrol.1.html" target="docs">smbcontrol</a> - Samba sunucularına kontrol iletileri gönderir
- <li><a href="/swat/help/smbpasswd.8.html" target="docs">smbpasswd</a> - SMB şifrelerini düzenler
- <li><a href="/swat/help/swat.8.html" target="docs">SWAT</a> - web arayüzlü ayar aracı
- <li><a href="/swat/help/make_smbcodepage.1.html" target="docs">make_smbcodepage</a> - kod sayfası oluşturur
- <li><a href="/swat/help/make_unicodemap.1.html" target="docs">make_unicodemap</a> - unicode eşleşme dosyası oluşturur
- <li><a href="/swat/help/smbrun.1.html" target="docs">smbrun</a> - içsel smbd aracı
- </ul>
- <li><b>İstemci Araçları</b>
- <ul>
- <li><a href="/swat/help/rpcclient.1.html" target="docs">rpcclient</a> - komut satırı MS-RPC istemcisi
- <li><a href="/swat/help/smbtar.1.html" target="docs">smbtar</a> - SMB yedekleme aracı
- <li><a href="/swat/help/smbclient.1.html" target="docs">smbclient</a> - komut satırı SMB istemcisi
- <li><a href="/swat/help/smbspool.8.html" target="docs">smbspool</a> - komut satırı SMB yazıcı istemcisi
- </ul>
- <li><b>Teşhis Araçları</b>
- <ul>
- <li><a href="/swat/help/smbstatus.1.html" target="docs">smbstatus</a> - Samba gözlemcisi
- <li><a href="/swat/help/testparm.1.html" target="docs">testparm</a> - ayar dosyasını kontrol eder
- <li><a href="/swat/help/testprns.1.html" target="docs">testprns</a> - yazıcı ayarlarını kontrol eder
- <li><a href="/swat/help/nmblookup.1.html" target="docs">nmblookup</a> - NetBIOS isim sorgulama aracı
- </ul>
- <li><b>Kitaplar</b>
- <ul>
- <li><a href="/swat/using_samba/index.html" target="docs">Samba'yı Kullanmak</a> - Yazan: Robert Eckstein, David Collier-Brown ve Peter Kelly
- </ul>
- <li><b>Samba HOWTO (Nasıl Yapılır?) Koleksiyonu</b></li>
- <ul>
- <li><a href="/swat/help/Samba-HOWTO-Collection.html">Bütün koleksiyon (tek dosya)</a>
- <li><a href="/swat/help/DOMAIN_MEMBER.html">Samba 2.x'de security = domain </a>
- <li><a href="/swat/help/winbind.html">Winbind Kullanarak Windows NT ve UNIX Arasında Birleşik Sistem Girişi</a>
- <li><a href="/swat/help/msdfs_setup.html">Samba'yı bir MS-DFS Sunucusu Olarak Ayarlamak</a>
- <li><a href="/swat/help/NT_Security.html">UNIX İzin Bitleri ve Samba 2.x</a>
- <li><a href="/swat/help/OS2-Client-HOWTO.html">OS/2 İstemcileri ve Samba</a>
- <li><a href="/swat/help/printer_driver2.html">Samba 2.2.x Altında Yazıcı Kullanımı</a>
- <li><a href="/swat/help/UNIX_INSTALL.html">Samba Nasıl Kurulur ve Kontrol Edilir?</a>
- <li><a href="/swat/help/Integrating-with-Windows.html">İsim Çözünme ve Yetkilendirme İşlemlerini Birleştirmek</a>
- <li><a href="/swat/help/CVS-Access.html">Samba yazılımlarına CVS Erişimi</a>
- </ul>
-</ul>
-
- <h3>İletişim</h3>
-
- Eğer SWAT'ın bu sürümü ile ilgili konuları tartışmak istiyorsanız, lütfen
-<A HREF="http://lists.samba.org/">samba</A> eposta listesine üye olun.
- \ No newline at end of file
diff --git a/swat/lang/tr/images/globals.gif b/swat/lang/tr/images/globals.gif
deleted file mode 100644
index c0722d2df5..0000000000
--- a/swat/lang/tr/images/globals.gif
+++ /dev/null
Binary files differ
diff --git a/swat/lang/tr/images/home.gif b/swat/lang/tr/images/home.gif
deleted file mode 100644
index 119b6da6ed..0000000000
--- a/swat/lang/tr/images/home.gif
+++ /dev/null
Binary files differ
diff --git a/swat/lang/tr/images/passwd.gif b/swat/lang/tr/images/passwd.gif
deleted file mode 100644
index 25652f211b..0000000000
--- a/swat/lang/tr/images/passwd.gif
+++ /dev/null
Binary files differ
diff --git a/swat/lang/tr/images/printers.gif b/swat/lang/tr/images/printers.gif
deleted file mode 100644
index a3caf2543b..0000000000
--- a/swat/lang/tr/images/printers.gif
+++ /dev/null
Binary files differ
diff --git a/swat/lang/tr/images/samba.gif b/swat/lang/tr/images/samba.gif
deleted file mode 100644
index 3ec3d2195f..0000000000
--- a/swat/lang/tr/images/samba.gif
+++ /dev/null
Binary files differ
diff --git a/swat/lang/tr/images/shares.gif b/swat/lang/tr/images/shares.gif
deleted file mode 100644
index bbac9d5411..0000000000
--- a/swat/lang/tr/images/shares.gif
+++ /dev/null
Binary files differ
diff --git a/swat/lang/tr/images/status.gif b/swat/lang/tr/images/status.gif
deleted file mode 100644
index c606d6fcb0..0000000000
--- a/swat/lang/tr/images/status.gif
+++ /dev/null
Binary files differ
diff --git a/swat/lang/tr/images/viewconfig.gif b/swat/lang/tr/images/viewconfig.gif
deleted file mode 100644
index 3261ab4d8b..0000000000
--- a/swat/lang/tr/images/viewconfig.gif
+++ /dev/null
Binary files differ