[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Thu Apr 29 04:37:42 MDT 2010
The branch, master has been updated
via 1765732... s4: remove unused references to swat
via 8e792d7... s4:dynconfig: fix fhs variables and list them all explicit
via 48fb78e... s4:dynconfig: reorder non fhs variables
from ce9fde4... rap: fill in rap_PrintQueue2 IDL.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1765732f82719a4bc925f21ef4999bd19a8d1f6c
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 29 07:51:32 2010 +0200
s4: remove unused references to swat
metze
commit 8e792d7b9bd1f9ce35fdaf6db4fc1d08e2ba8bda
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 29 08:29:56 2010 +0200
s4:dynconfig: fix fhs variables and list them all explicit
This adds 'samba' subdirs to smb.conf and setup.
metze
commit 48fb78eba6cfe8ddccc6af10170c0537a260c6b1
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 29 08:29:45 2010 +0200
s4:dynconfig: reorder non fhs variables
metze
-----------------------------------------------------------------------
Summary of changes:
source4/Makefile.in | 1 -
source4/dynconfig/config.mk | 1 -
source4/dynconfig/dynconfig.c | 3 ---
source4/dynconfig/dynconfig.h | 2 --
source4/dynconfig/wscript | 39 ++++++++++++++++++++-------------------
source4/param/loadparm.c | 4 ----
source4/param/param.h | 1 -
source4/script/installswat.sh | 37 -------------------------------------
source4/smbd/server.c | 1 -
9 files changed, 20 insertions(+), 69 deletions(-)
delete mode 100755 source4/script/installswat.sh
Changeset truncated at 500 lines:
diff --git a/source4/Makefile.in b/source4/Makefile.in
index 40ea286..45f2f16 100644
--- 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 976ca71..0e7408a 100644
--- 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 d515bf7..a56dd3d 100644
--- 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 48f8ab6..de9ff87 100644
--- 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 e87ada1..4a48501 100644
--- a/source4/dynconfig/wscript
+++ b/source4/dynconfig/wscript
@@ -15,46 +15,47 @@ dir_options = {
# list of cflags to use for dynconfig.c
dyn_cflags = {
- 'CONFIGFILE' : '${SYSCONFDIR}/smb.conf',
'BINDIR' : '${BINDIR}',
'SBINDIR' : '${SBINDIR}',
+ 'CONFIGDIR' : '${SYSCONFDIR}',
+ 'CONFIGFILE' : '${SYSCONFDIR}/smb.conf',
'LMHOSTSFILE' : '${SYSCONFDIR}/lmhosts',
+ 'PRIVATE_DIR' : '${PRIVATEDIR}',
+ 'LOGFILEBASE' : '${LOCALSTATEDIR}',
'LOCKDIR' : '${LOCALSTATEDIR}/locks',
'PIDDIR' : '${LOCALSTATEDIR}/run',
'DATADIR' : '${DATADIR}',
- 'LOGFILEBASE' : '${LOCALSTATEDIR}',
- 'CONFIGDIR' : '${SYSCONFDIR}',
- 'NCALRPCDIR' : '${LOCALSTATEDIR}/ncalrpc',
- 'SWATDIR' : '${DATADIR}/swat',
- 'PRIVATE_DIR' : '${PRIVATEDIR}',
- 'MODULESDIR' : '${PREFIX}/modules',
'SETUPDIR' : '${DATADIR}/setup',
- 'INCLUDEDIR' : '${PREFIX}/include',
- 'WINBINDD_PRIVILEGED_SOCKET_DIR' : '${WINBINDD_PRIVILEGED_SOCKET_DIR}',
'WINBINDD_SOCKET_DIR' : '${WINBINDD_SOCKET_DIR}',
+ 'WINBINDD_PRIVILEGED_SOCKET_DIR' : '${WINBINDD_PRIVILEGED_SOCKET_DIR}',
'NTP_SIGND_SOCKET_DIR' : '${NTP_SIGND_SOCKET_DIR}',
- 'PKGCONFIGDIR' : '${LIBDIR}/pkgconfig',
+ 'NCALRPCDIR' : '${LOCALSTATEDIR}/ncalrpc',
'PYTHONDIR' : '${PYTHONDIR}',
+ 'MODULESDIR' : '${PREFIX}/modules',
+ 'INCLUDEDIR' : '${PREFIX}/include',
+ 'PKGCONFIGDIR' : '${LIBDIR}/pkgconfig',
}
# changes for when FHS is enabled
dyn_cflags_fhs = {
+ 'BINDIR' : '${BINDIR}',
+ 'SBINDIR' : '${SBINDIR}',
'CONFIGDIR' : '${SYSCONFDIR}/samba',
- 'CONFIGFILE' : '${CONFIGDIR}/smb.conf',
- 'LMHOSTSFILE' : '${CONFIGDIR}/lmhosts',
+ 'CONFIGFILE' : '${SYSCONFDIR}/samba/smb.conf',
+ 'LMHOSTSFILE' : '${SYSCONFDIR}/samba/lmhosts',
+ 'PRIVATE_DIR' : '${LOCALSTATEDIR}/lib/samba/private',
+ 'LOGFILEBASE' : '${LOCALSTATEDIR}/log/samba',
'LOCKDIR' : '${LOCALSTATEDIR}/lib/samba',
'PIDDIR' : '${LOCALSTATEDIR}/run/samba',
- 'LOGFILEBASE' : '${LOCALSTATEDIR}/log/samba',
- 'PRIVATE_DIR' : '${LOCALSTATEDIR}/lib/samba/private',
- 'MODULESDIR' : '${LIBDIR}/samba',
'DATADIR' : '${DATADIR}/samba',
- 'INCLUDEDIR' : '${INCLUDEDIR}/samba-4.0',
- 'NTP_SIGND_SOCKET_DIR' : '${LOCALSTATEDIR}/run/samba/ntp_signd',
+ 'SETUPDIR' : '${DATADIR}/samba/setup',
'WINBINDD_SOCKET_DIR' : '${LOCALSTATEDIR}/run/samba/winbindd',
'WINBINDD_PRIVILEGED_SOCKET_DIR' : '${LOCALSTATEDIR}/run/samba/winbindd_privileged',
+ 'NTP_SIGND_SOCKET_DIR' : '${LOCALSTATEDIR}/run/samba/ntp_signd',
'NCALRPCDIR' : '${LOCALSTATEDIR}/ncalrpc',
- 'SWATDIR' : '${DATADIR}/swat',
- 'SETUPDIR' : '${DATADIR}/setup',
+ 'PYTHONDIR' : '${PYTHONDIR}',
+ 'MODULESDIR' : '${LIBDIR}/samba',
+ 'INCLUDEDIR' : '${INCLUDEDIR}/samba-4.0',
'PKGCONFIGDIR' : '${LIBDIR}/pkgconfig',
}
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 45b2064..a9ce470 100644
--- 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 8bb368f..6253f43 100644
--- 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
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 1494215..8eea471 100644
--- 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),
--
Samba Shared Repository
More information about the samba-cvs
mailing list