s4: remove unused references to swat

metze

diff --git a/source4/Makefile.in b/source4/Makefile.in
index 40ea2868ddf6b08586a17e1c0d957d7025f634b4..45f2f16b632ab5969ec5e97d940c775e5fd1ccbf 100644 (file)
--- a/source4/Makefile.in
+++ b/source4/Makefile.in
@@ -11,7 +11,6 @@ include mkconfig.mk
 pidldir := $(srcdir)/../pidl
 
 basedir = $(prefix)
-swatdir = $(datadir)/swat
 setupdir = $(datadir)/setup
 ncalrpcdir = $(localstatedir)/ncalrpc
 shliboutputdir = $(builddir)/bin/shared

diff --git a/source4/dynconfig/config.mk b/source4/dynconfig/config.mk
index 976ca71742baeec7429b582458f5efb967853c2a..0e7408a57e48a9c3c7f4f905c806616f728b9b88 100644 (file)
--- a/source4/dynconfig/config.mk
+++ b/source4/dynconfig/config.mk
@@ -15,7 +15,6 @@ $(dynconfigsrcdir)/dynconfig.o: CFLAGS+=-DCONFIGFILE=\"$(CONFIG4FILE)\" -DBINDIR
         -DLOCKDIR=\"$(lockdir)\" -DPIDDIR=\"$(piddir)\" -DDATADIR=\"$(datadir)\" \
         -DLOGFILEBASE=\"$(logfilebase)\" \
         -DCONFIGDIR=\"$(sysconfdir)\" -DNCALRPCDIR=\"$(ncalrpcdir)\" \
-        -DSWATDIR=\"$(swatdir)\" \
         -DPRIVATE_DIR=\"$(privatedir)\" \
         -DMODULESDIR=\"$(modulesdir)\" \
         -DSETUPDIR=\"$(setupdir)\" \

diff --git a/source4/dynconfig/dynconfig.c b/source4/dynconfig/dynconfig.c
index d515bf7a2d44dbdcd0539e71879fa8ea2234902a..a56dd3d931258c671b19dffa8d319e72b196b456 100644 (file)
--- a/source4/dynconfig/dynconfig.c
+++ b/source4/dynconfig/dynconfig.c
@@ -76,9 +76,6 @@ _PUBLIC_ const char *dyn_PIDDIR  = PIDDIR;
 /** Private data directory; holds ldb files and the like */
 _PUBLIC_ const char *dyn_PRIVATE_DIR = PRIVATE_DIR;
 
-/** SWAT  directory */
-_PUBLIC_ const char *dyn_SWATDIR = SWATDIR;
-
 /** SETUP files (source files used by the provision) */
 _PUBLIC_ const char *dyn_SETUPDIR = SETUPDIR;
 

diff --git a/source4/dynconfig/dynconfig.h b/source4/dynconfig/dynconfig.h
index 48f8ab628fecec6ed6109358bc0d96ca16989996..de9ff87518a26d5380b8ee58173c778c2fa318ab 100644 (file)
--- a/source4/dynconfig/dynconfig.h
+++ b/source4/dynconfig/dynconfig.h
@@ -35,8 +35,6 @@ extern const char *dyn_MODULESDIR;
 extern const char *dyn_LOCKDIR; 
 extern const char *dyn_PIDDIR;
 extern const char *dyn_PRIVATE_DIR;
-extern const char *dyn_SWATDIR;
-extern const char *dyn_JSDIR;
 extern const char *dyn_SETUPDIR;
 extern const char *dyn_WINBINDD_SOCKET_DIR;
 extern const char *dyn_WINBINDD_PRIVILEGED_SOCKET_DIR;

diff --git a/source4/dynconfig/wscript b/source4/dynconfig/wscript
index 1d9a603bdd9af376e781b9197cfa279b9574e0bd..4a485012e84bfbc45eabc17c178015745c64af8a 100644 (file)
--- a/source4/dynconfig/wscript
+++ b/source4/dynconfig/wscript
@@ -34,7 +34,6 @@ dyn_cflags = {
     'MODULESDIR'                     : '${PREFIX}/modules',
     'INCLUDEDIR'                     : '${PREFIX}/include',
     'PKGCONFIGDIR'                   : '${LIBDIR}/pkgconfig',
-    'SWATDIR'                        : '${DATADIR}/swat',
     }
 
 # changes for when FHS is enabled
@@ -58,7 +57,6 @@ dyn_cflags_fhs = {
     'MODULESDIR'                     : '${LIBDIR}/samba',
     'INCLUDEDIR'                     : '${INCLUDEDIR}/samba-4.0',
     'PKGCONFIGDIR'                   : '${LIBDIR}/pkgconfig',
-    'SWATDIR'                        : '${DATADIR}/swat',
     }
 
 def get_varname(v):

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 45b206483de00379b94b1048085a76b391697389..a9ce470e920b6a4d0497334d09859927b4905219 100644 (file)
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -127,7 +127,6 @@ struct loadparm_global
        char *szTemplateHomedir;
        int bWinbindSealedPipes;
        int bIdmapTrustedOnly;
-       char *swat_directory;
        int tls_enabled;
        char *tls_keyfile;
        char *tls_certfile;
@@ -415,7 +414,6 @@ static struct parm_struct parm_table[] = {
        {"tls cafile", P_STRING, P_GLOBAL, GLOBAL_VAR(tls_cafile), NULL, NULL},
        {"tls crlfile", P_STRING, P_GLOBAL, GLOBAL_VAR(tls_crlfile), NULL, NULL},
        {"tls dh params file", P_STRING, P_GLOBAL, GLOBAL_VAR(tls_dhpfile), NULL, NULL},
-       {"swat directory", P_STRING, P_GLOBAL, GLOBAL_VAR(swat_directory), NULL, NULL},
        {"large readwrite", P_BOOL, P_GLOBAL, GLOBAL_VAR(bLargeReadwrite), NULL, NULL},
        {"server max protocol", P_ENUM, P_GLOBAL, GLOBAL_VAR(srv_maxprotocol), NULL, enum_protocol},
        {"server min protocol", P_ENUM, P_GLOBAL, GLOBAL_VAR(srv_minprotocol), NULL, enum_protocol},
@@ -636,7 +634,6 @@ _PUBLIC_ FN_GLOBAL_INTEGER(lp_cldap_port, cldap_port)
 _PUBLIC_ FN_GLOBAL_INTEGER(lp_krb5_port, krb5_port)
 _PUBLIC_ FN_GLOBAL_INTEGER(lp_kpasswd_port, kpasswd_port)
 _PUBLIC_ FN_GLOBAL_INTEGER(lp_web_port, web_port)
-_PUBLIC_ FN_GLOBAL_STRING(lp_swat_directory, swat_directory)
 _PUBLIC_ FN_GLOBAL_BOOL(lp_tls_enabled, tls_enabled)
 _PUBLIC_ FN_GLOBAL_STRING(lp_share_backend, szShareBackend)
 _PUBLIC_ FN_GLOBAL_STRING(lp_sam_url, szSAM_URL)
@@ -2442,7 +2439,6 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
        lp_do_global_parameter(lp_ctx, "krb5 port", "88");
        lp_do_global_parameter(lp_ctx, "kpasswd port", "464");
        lp_do_global_parameter(lp_ctx, "web port", "901");
-       lp_do_global_parameter(lp_ctx, "swat directory", dyn_SWATDIR);
 
        lp_do_global_parameter(lp_ctx, "nt status support", "True");
 

diff --git a/source4/param/param.h b/source4/param/param.h
index 8bb368f3d72b7a4cc079fe4060fd9fc748e50bd4..6253f43f088011e54e7d82aec641b0caa1d3d579 100644 (file)
--- a/source4/param/param.h
+++ b/source4/param/param.h
@@ -82,7 +82,6 @@ int lp_cldap_port(struct loadparm_context *);
 int lp_krb5_port(struct loadparm_context *);
 int lp_kpasswd_port(struct loadparm_context *);
 int lp_web_port(struct loadparm_context *);
-const char *lp_swat_directory(struct loadparm_context *);
 bool lp_tls_enabled(struct loadparm_context *);
 char *lp_tls_keyfile(TALLOC_CTX *mem_ctx, struct loadparm_context *);
 char *lp_tls_certfile(TALLOC_CTX *mem_ctx, struct loadparm_context *);

diff --git a/source4/script/installswat.sh b/source4/script/installswat.sh
deleted file mode 100755 (executable)
index 4304e3e..0000000
--- a/source4/script/installswat.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-SWATDIR=$1
-SRCDIR=$2
-
-echo Installing swat files in $SWATDIR
-
-cd $SRCDIR/../swat || exit 1
-
-mkdir -p $SWATDIR || exit 1
-
-installdir() {
-    for f in $*; do
-       dname=`dirname $f`
-       echo "Installing $f in $dname"
-       test -d $SWATDIR/$dname || mkdir -p $SWATDIR/$dname || exit 1
-       cp $f $SWATDIR/$dname/ || exit 1
-       chmod 0644 $SWATDIR/$f || exit 1
-    done
-}
-
-installdir `find . -name '*.js'`
-installdir `find . -name '*.esp'`
-installdir `find . -name '*.css'`
-installdir `find . -name '*.png'`
-installdir `find . -name '*.ico'`
-installdir `find . -name '*.gif'`
-installdir `find . -name '*.ejs'`
-
-cat << EOF
-======================================================================
-The swat files have been installed. 
-======================================================================
-EOF
-
-exit 0
-

diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 149421532f2f4fd2bc9d7b9fd6968c017155816a..8eea471140b7f8dd41f3d9c71e2a36ed80c1b895 100644 (file)
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -254,7 +254,6 @@ static void show_build(void)
                CONFIG_OPTION(LOCKDIR),
                CONFIG_OPTION(PIDDIR),
                CONFIG_OPTION(PRIVATE_DIR),
-               CONFIG_OPTION(SWATDIR),
                CONFIG_OPTION(SETUPDIR),
                CONFIG_OPTION(WINBINDD_SOCKET_DIR),
                CONFIG_OPTION(WINBINDD_PRIVILEGED_SOCKET_DIR),