[SCM] Samba Shared Repository - branch master updated - 0bb7ccd0b0d245f87aaab71f3deaee49df9c27c7

[Jelmer Vernooij]

The branch, master has been updated
       via  0bb7ccd0b0d245f87aaab71f3deaee49df9c27c7 (commit)
       via  f69ac1398770e4c8c211e083bcf526f9a9d99e4a (commit)
       via  1a20f101b56288ae664834943b0c9f5ab1acd99f (commit)
      from  dc6edf1ab4ae8e3fb3ef40b93135ff0ef5407e12 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0bb7ccd0b0d245f87aaab71f3deaee49df9c27c7
Merge: f69ac1398770e4c8c211e083bcf526f9a9d99e4a dc6edf1ab4ae8e3fb3ef40b93135ff0ef5407e12
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Jan 16 15:51:46 2009 +0100

    Merge branch 'master' of ssh://git.samba.org/data/git/samba

commit f69ac1398770e4c8c211e083bcf526f9a9d99e4a
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Jan 16 15:50:58 2009 +0100

    Add copyright headers.

commit 1a20f101b56288ae664834943b0c9f5ab1acd99f
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Jan 16 15:50:03 2009 +0100

    s4/NEWS: Remove mention of no longer existing js parameter.

-----------------------------------------------------------------------

Summary of changes:
 source4/NEWS              |    5 -----
 source4/setup/newuser     |   22 +++++++++++++++++-----
 source4/setup/setpassword |   22 ++++++++++++++++++----
 source4/setup/upgrade     |   23 ++++++++++++++++++-----
 4 files changed, 53 insertions(+), 19 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/NEWS b/source4/NEWS
index 8a63719..b441bc7 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 5b677af..281e384 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 65770e1..90a217f 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 3363c3a..9d73093 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)


-- 
Samba Shared Repository