summaryrefslogtreecommitdiff
path: root/source4/script
diff options
context:
space:
mode:
Diffstat (limited to 'source4/script')
-rwxr-xr-xsource4/script/gdb_run1
-rwxr-xr-x[-rw-r--r--]source4/script/installbin.sh0
-rwxr-xr-xsource4/script/installjsonrpc.sh32
-rwxr-xr-x[-rw-r--r--]source4/script/installman.sh0
-rwxr-xr-xsource4/script/installmisc.sh7
-rwxr-xr-x[-rw-r--r--]source4/script/installmodules.sh0
-rwxr-xr-x[-rw-r--r--]source4/script/installscripts.sh0
-rwxr-xr-xsource4/script/installswat.sh37
-rwxr-xr-xsource4/script/installwebapps.sh51
-rwxr-xr-xsource4/script/lex_compile.sh8
-rwxr-xr-xsource4/script/mkproto.pl37
-rwxr-xr-xsource4/script/mkversion.sh2
-rwxr-xr-x[-rw-r--r--]source4/script/revert.sh0
-rwxr-xr-x[-rw-r--r--]source4/script/uninstallbin.sh0
-rwxr-xr-x[-rw-r--r--]source4/script/uninstallman.sh0
-rwxr-xr-x[-rw-r--r--]source4/script/uninstallmodules.sh0
-rwxr-xr-x[-rw-r--r--]source4/script/uninstallscripts.sh0
17 files changed, 71 insertions, 104 deletions
diff --git a/source4/script/gdb_run b/source4/script/gdb_run
index bfefce1ac9..146259d705 100755
--- a/source4/script/gdb_run
+++ b/source4/script/gdb_run
@@ -8,7 +8,6 @@ TMPFILE=$TMPDIR/gdb_run.$$
cat << EOF > $TMPFILE
run
bt
-quit
EOF
trap "/bin/rm -f $TMPFILE" EXIT
diff --git a/source4/script/installbin.sh b/source4/script/installbin.sh
index c2f34082dd..c2f34082dd 100644..100755
--- a/source4/script/installbin.sh
+++ b/source4/script/installbin.sh
diff --git a/source4/script/installjsonrpc.sh b/source4/script/installjsonrpc.sh
deleted file mode 100755
index b91f6bf3bb..0000000000
--- a/source4/script/installjsonrpc.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-SERVICESDIR=$1
-SRCDIR=$2
-
-echo Installing JSON-RPC services in $SERVICESDIR
-
-cd $SRCDIR/../services || exit 1
-
-mkdir -p $SERVICESDIR || exit 1
-
-installdir() {
- for f in $*; do
- dname=`dirname $f`
- echo "Installing $f in $dname"
- test -d $SERVICESDIR/$dname || mkdir -p $SERVICESDIR/$dname || exit 1
- cp $f $SERVICESDIR/$dname/ || exit 1
- chmod 0644 $SERVICESDIR/$f || exit 1
- done
-}
-
-installdir `find . -name '*.esp'`
-
-cat << EOF
-======================================================================
-The JSON-RPC services have been installed.
-======================================================================
-EOF
-
-
-exit 0
-
diff --git a/source4/script/installman.sh b/source4/script/installman.sh
index ae99bceacf..ae99bceacf 100644..100755
--- a/source4/script/installman.sh
+++ b/source4/script/installman.sh
diff --git a/source4/script/installmisc.sh b/source4/script/installmisc.sh
index 1555fa21d2..55297c43d9 100755
--- a/source4/script/installmisc.sh
+++ b/source4/script/installmisc.sh
@@ -16,11 +16,18 @@ echo "Installing setup templates"
mkdir -p $SETUPDIR || exit 1
cp setup/schema-map-* $SETUPDIR || exit 1
cp setup/DB_CONFIG $SETUPDIR || exit 1
+cp setup/upgrade $SETUPDIR || exit 1
+cp setup/provision-backend $SETUPDIR || exit 1
+cp setup/provision $SETUPDIR || exit 1
+cp setup/newuser $SETUPDIR || exit 1
cp setup/*.inf $SETUPDIR || exit 1
cp setup/*.ldif $SETUPDIR || exit 1
cp setup/*.reg $SETUPDIR || exit 1
cp setup/*.zone $SETUPDIR || exit 1
cp setup/*.conf $SETUPDIR || exit 1
+cp setup/provision.smb.conf.dc $SETUPDIR || exit 1
+cp setup/provision.smb.conf.member $SETUPDIR || exit 1
+cp setup/provision.smb.conf.standalone $SETUPDIR || exit 1
echo "Installing script tools"
mkdir -p "$BINDIR"
diff --git a/source4/script/installmodules.sh b/source4/script/installmodules.sh
index fb0ad90c14..fb0ad90c14 100644..100755
--- a/source4/script/installmodules.sh
+++ b/source4/script/installmodules.sh
diff --git a/source4/script/installscripts.sh b/source4/script/installscripts.sh
index bff5423e7c..bff5423e7c 100644..100755
--- a/source4/script/installscripts.sh
+++ b/source4/script/installscripts.sh
diff --git a/source4/script/installswat.sh b/source4/script/installswat.sh
new file mode 100755
index 0000000000..4304e3e490
--- /dev/null
+++ b/source4/script/installswat.sh
@@ -0,0 +1,37 @@
+#!/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/script/installwebapps.sh b/source4/script/installwebapps.sh
deleted file mode 100755
index 25a43dba24..0000000000
--- a/source4/script/installwebapps.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-WEBAPPSDIR=$1
-SRCDIR=$2
-
-echo Installing web application files in $WEBAPPSDIR
-
-cd $SRCDIR/../webapps/swat || exit 1
-
-# building the web application framework is now done by autogen.sh
-#make build || exit 1
-
-mkdir -p $WEBAPPSDIR || exit 1
-
-installdir() {
- for f in $*; do
- dname=`dirname $f`
- echo "Installing $f in $dname"
- test -d $WEBAPPSDIR/$dname || mkdir -p $WEBAPPSDIR/$dname || exit 1
- cp $f $WEBAPPSDIR/$dname/ || exit 1
- chmod 0644 $WEBAPPSDIR/$f || exit 1
- done
-}
-
-# install our web application
-cd build || exit 1
-installdir `find . -type f -print`
-
-# install files from the 'scripting', 'style' and 'images' directories
-cd ../.. || exit 1
-installdir `find scripting -name '*.js'`
-installdir `find scripting -name '*.esp'`
-installdir `find style -name '*.css'`
-installdir `find images -name '*.png'`
-installdir `find images -name '*.gif'`
-installdir `find images -name '*.ico'`
-
-# install the old installation scripts, since there's no replacement yet
-installdir `find install -name '*.esp'`
-
-# install top-level scripts
-installdir index.esp login.esp logout.esp menu.js
-
-cat << EOF
-======================================================================
-The web application files have been installed.
-======================================================================
-EOF
-
-exit 0
-
diff --git a/source4/script/lex_compile.sh b/source4/script/lex_compile.sh
index f655f81f2d..9bba7257b1 100755
--- a/source4/script/lex_compile.sh
+++ b/source4/script/lex_compile.sh
@@ -35,8 +35,14 @@ if cd $dir && $LEX $ARGS $file; then
if [ -r $base.yy.c ];then
# we must guarantee that config.h comes first
echo "#include \"config.h\"" > $base.c
- sed '/^#/ s|$base.yy\.c|$DEST|' $base.yy.c >> $base.c
+ sed -e "s|$base\.yy\.c|$DEST|" $base.yy.c >> $base.c
rm -f $base.yy.c
+ elif [ -r $base.c ];then
+ # we must guarantee that config.h comes first
+ mv $base.c $base.c.tmp
+ echo "#include \"config.h\"" > $base.c
+ sed -e "s|$base\.yy\.c|$DEST|" $base.c.tmp >> $base.c
+ rm -f $base.c.tmp
elif [ ! -r base.c ]; then
echo "$base.c nor $base.yy.c generated."
exit 1
diff --git a/source4/script/mkproto.pl b/source4/script/mkproto.pl
index 51888c704f..f1c2cf9d0e 100755
--- a/source4/script/mkproto.pl
+++ b/source4/script/mkproto.pl
@@ -68,20 +68,24 @@ GetOptions(
'help' => \&usage
) or exit(1);
-if (not defined($public_define) and defined($public_file)) {
- $public_define = ".." . uc($public_file) . "__";
- $public_define =~ tr{./}{__};
-} elsif (not defined($public_define)) {
- $public_define = '_PROTO_H_';
-}
+sub normalize_define($$)
+{
+ my ($define, $file) = @_;
+
+ if (not defined($define) and defined($file)) {
+ $define = "__" . uc($file) . "__";
+ $define =~ tr{./}{__};
+ $define =~ tr{\-}{_};
+ } elsif (not defined($define)) {
+ $define = '_PROTO_H_';
+ }
-if (not defined($private_define) and defined($private_file)) {
- $private_define = "__" . uc($private_file) . "__";
- $private_define =~ tr{./}{__};
-} elsif (not defined($public_define)) {
- $public_define = '_PROTO_H_';
+ return $define;
}
+$public_define = normalize_define($public_define, $public_file);
+$private_define = normalize_define($private_define, $private_file);
+
if ((defined($private_file) and defined($public_file) and ($private_file eq $public_file)) or
(not defined($private_file) and not defined($public_file))) {
$private_data = $public_data;
@@ -129,7 +133,6 @@ sub handle_loadparm($$)
my %tmap = (
"BOOL" => "bool ",
- "bool" => "bool ",
"CONST_STRING" => "const char *",
"STRING" => "const char *",
"INTEGER" => "int ",
@@ -138,8 +141,8 @@ sub handle_loadparm($$)
);
my %smap = (
- "GLOBAL" => "void",
- "LOCAL" => "int "
+ "GLOBAL" => "struct loadparm_context *",
+ "LOCAL" => "struct loadparm_service *"
);
$file->("$tmap{$type}$name($smap{$scope});\n");
@@ -194,8 +197,8 @@ sub process_file($$$)
}
next unless ( $is_public || $line =~ /
- (_DEPRECATED_ |_NORETURN_ |_WARN_UNUSED_RESULT_ |_PURE_ )*^(
- void|BOOL|bool|int|struct|char|const|\w+_[tT]\s|uint|unsigned|long|NTSTATUS|
+ ^(_DEPRECATED_ |_NORETURN_ |_WARN_UNUSED_RESULT_ |_PURE_ )*(
+ void|bool|int|struct|char|const|\w+_[tT]\s|uint|unsigned|long|NTSTATUS|
ADS_STATUS|enum\s.*\(|DATA_BLOB|WERROR|XFILE|FILE|DIR|
double|TDB_CONTEXT|TDB_DATA|TALLOC_CTX|NTTIME|FN_|init_module|
GtkWidget|GType|smb_ucs2_t|krb5_error_code)
@@ -205,7 +208,6 @@ sub process_file($$$)
$target->("\n$comment") if (defined($comment)); $comment = undef;
- $line =~ s/BOOL /bool /g;
if ( $line =~ /\(.*\)\s*$/o ) {
chomp $line;
$target->("$line;\n");
@@ -215,7 +217,6 @@ sub process_file($$$)
$target->($line);
while ($line = <FH>) {
- $line =~ s/BOOL /bool /g;
if ($line =~ /\)\s*$/o) {
chomp $line;
$target->("$line;\n");
diff --git a/source4/script/mkversion.sh b/source4/script/mkversion.sh
index 91c7894cdb..828f67d71b 100755
--- a/source4/script/mkversion.sh
+++ b/source4/script/mkversion.sh
@@ -111,7 +111,7 @@ if test x"${SAMBA_VERSION_IS_SVN_SNAPSHOT}" = x"yes";then
if test x"${HAVEVER}" != x"yes" -a -d "${SOURCE_DIR}../.git";then
HAVEGIT=no
GIT_INFO=`git show --abbrev-commit HEAD 2>/dev/null`
- TMP_REVISION=`echo -e "${GIT_INFO}" | grep 'commit ' | sed 1q |sed -e 's/commit \([0-9a-f]*\).*/\1/'`
+ TMP_REVISION=`echo -e "${GIT_INFO}" | sed 1q | grep 'commit ' | sed -e 's/commit \([0-9a-f]*\).*/\1/'`
if test -n "$TMP_REVISION";then
HAVEGIT=yes
HAVEVER=yes
diff --git a/source4/script/revert.sh b/source4/script/revert.sh
index 8df5fd2fbd..8df5fd2fbd 100644..100755
--- a/source4/script/revert.sh
+++ b/source4/script/revert.sh
diff --git a/source4/script/uninstallbin.sh b/source4/script/uninstallbin.sh
index a8bbdea7af..a8bbdea7af 100644..100755
--- a/source4/script/uninstallbin.sh
+++ b/source4/script/uninstallbin.sh
diff --git a/source4/script/uninstallman.sh b/source4/script/uninstallman.sh
index 72b523ed9e..72b523ed9e 100644..100755
--- a/source4/script/uninstallman.sh
+++ b/source4/script/uninstallman.sh
diff --git a/source4/script/uninstallmodules.sh b/source4/script/uninstallmodules.sh
index 30582a39fa..30582a39fa 100644..100755
--- a/source4/script/uninstallmodules.sh
+++ b/source4/script/uninstallmodules.sh
diff --git a/source4/script/uninstallscripts.sh b/source4/script/uninstallscripts.sh
index 13104acedd..13104acedd 100644..100755
--- a/source4/script/uninstallscripts.sh
+++ b/source4/script/uninstallscripts.sh
generated by cgit (git 2.34.1) at 2025-08-21 02:34:55 +0000