summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/NEWS5
-rwxr-xr-xsource4/setup/newuser22
-rwxr-xr-xsource4/setup/setpassword22
-rwxr-xr-xsource4/setup/upgrade23
4 files changed, 53 insertions, 19 deletions
diff --git a/source4/NEWS b/source4/NEWS
index 8a63719a0e..b441bc784f 100644
--- a/source4/NEWS
+++ b/source4/NEWS
@@ -348,11 +348,6 @@ The following parameters have been added:
Default: no
-+ js include (G)
- Path to JavaScript library.
-
- Default: Set at compile-time
-
+ setup directory
Path to data used by provisioning script.
diff --git a/source4/setup/newuser b/source4/setup/newuser
index 5b677af142..281e3849fa 100755
--- a/source4/setup/newuser
+++ b/source4/setup/newuser
@@ -1,11 +1,23 @@
#!/usr/bin/python
#
-# add a new user to a Samba4 server
-# Copyright Andrew Tridgell 2005
-# Copyright Jelmer Vernooij 2008
-# Released under the GNU GPL version 3 or later
+# Add a new user to a Samba4 server
+# Copyright Jelmer Vernooij 2008
#
-
+# Based on the original in EJS:
+# Copyright Andrew Tridgell 2005
+#
+# 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/>.
import sys
# Find right directory when running from source tree
diff --git a/source4/setup/setpassword b/source4/setup/setpassword
index 65770e1f4d..90a217fb6f 100755
--- a/source4/setup/setpassword
+++ b/source4/setup/setpassword
@@ -1,9 +1,23 @@
#!/usr/bin/python
#
-# add a new user to a Samba4 server
-# Copyright Andrew Tridgell 2005
-# Copyright Jelmer Vernooij 2008
-# Released under the GNU GPL version 3 or later
+# Add a new user to a Samba4 server
+# Copyright Jelmer Vernooij 2008
+#
+# Based on the original in EJS:
+# Copyright Andrew Tridgell 2005
+#
+# 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/>.
#
import os, sys
diff --git a/source4/setup/upgrade b/source4/setup/upgrade
index 3363c3a962..9d73093434 100755
--- a/source4/setup/upgrade
+++ b/source4/setup/upgrade
@@ -1,9 +1,21 @@
#!/usr/bin/python
#
-# Upgrade from Samba3
-# Copyright Jelmer Vernooij 2005-2007
-# Released under the GNU GPL v3 or later
+# Upgrade from Samba3
+# Copyright Jelmer Vernooij 2005-2007
#
+# 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/>.
+
import getopt
import optparse
import os, sys
@@ -65,5 +77,6 @@ lp = sambaopts.get_loadparm()
smbconf = lp.configfile
creds = credopts.get_credentials(lp)
-upgrade_provision(samba3, setup_dir, message, credentials=creds, session_info=system_session(),
- smbconf=smbconf, targetdir=opts.targetdir)
+upgrade_provision(samba3, setup_dir, message, credentials=creds,
+ session_info=system_session(), smbconf=smbconf,
+ targetdir=opts.targetdir)