swat: Remove swat.

Signed-off-by: Kai Blin <[email protected]> Reviewed-by: Andrew Bartlett <[email protected]> Autobuild-User(master): Kai Blin <[email protected]> Autobuild-Date(master): Sat May 18 16:32:38 CEST 2013 on sn-devel-104
heftig · May 18, 2013 · 61a2ad3 · 61a2ad3
1 parent a3a3086
commit 61a2ad3
Show file tree

Hide file tree

Showing 69 changed files with 41 additions and 10,235 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
diff --git 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.
 ***************************************************************************/