r8384: merging clutter fixes from release branch

(This used to be commit cbe74c09109dcfe93aa4af085920999ccbff34df)

19 files changed, 1 insertions, 26 deletions

diff --git a/examples/genlogon/genlogon.pl b/examples/logon/genlogon/genlogon.pl
index 8ebf392141..8ebf392141 100644
--- a/examples/genlogon/genlogon.pl
+++ b/examples/logon/genlogon/genlogon.pl
diff --git a/examples/mklogon/mklogon.conf b/examples/logon/mklogon/mklogon.conf
index 1f1faa77e3..1f1faa77e3 100644
--- a/examples/mklogon/mklogon.conf
+++ b/examples/logon/mklogon/mklogon.conf
diff --git a/examples/mklogon/mklogon.pl b/examples/logon/mklogon/mklogon.pl
index 88ee97c979..88ee97c979 100644
--- a/examples/mklogon/mklogon.pl
+++ b/examples/logon/mklogon/mklogon.pl
diff --git a/examples/ntlogon/README b/examples/logon/ntlogon/README
index e33c565d71..e33c565d71 100644
--- a/examples/ntlogon/README
+++ b/examples/logon/ntlogon/README
diff --git a/examples/ntlogon/ntlogon.conf b/examples/logon/ntlogon/ntlogon.conf
index e1573a6118..e1573a6118 100644
--- a/examples/ntlogon/ntlogon.conf
+++ b/examples/logon/ntlogon/ntlogon.conf
diff --git a/examples/ntlogon/ntlogon.py b/examples/logon/ntlogon/ntlogon.py
index ba46ba8ffc..ba46ba8ffc 100755
--- a/examples/ntlogon/ntlogon.py
+++ b/examples/logon/ntlogon/ntlogon.py
diff --git a/examples/scripts/backtrace b/examples/scripts/debugging/linux/backtrace
index 2ea6a4d00a..2ea6a4d00a 100644
--- a/examples/scripts/backtrace
+++ b/examples/scripts/debugging/linux/backtrace
diff --git a/examples/debugging/README b/examples/scripts/debugging/solaris/README
index 9e336805e5..9e336805e5 100644
--- a/examples/debugging/README
+++ b/examples/scripts/debugging/solaris/README
diff --git a/examples/debugging/solaris-oops.sh b/examples/scripts/debugging/solaris/solaris-oops.sh
index 82c49efdf6..82c49efdf6 100644
--- a/examples/debugging/solaris-oops.sh
+++ b/examples/scripts/debugging/solaris/solaris-oops.sh
diff --git a/examples/scripts/perl/smbaddprinter.pl b/examples/scripts/printing/cups/smbaddprinter.pl
index 557183140e..557183140e 100755
--- a/examples/scripts/perl/smbaddprinter.pl
+++ b/examples/scripts/printing/cups/smbaddprinter.pl
diff --git a/examples/scripts/perl/smbdelprinter.pl b/examples/scripts/printing/cups/smbdelprinter.pl
index 30daf24b35..30daf24b35 100755
--- a/examples/scripts/perl/smbdelprinter.pl
+++ b/examples/scripts/printing/cups/smbdelprinter.pl
diff --git a/examples/scripts/perl/modify_samba_config.pl b/examples/scripts/shares/perl/modify_samba_config.pl
index ad958625d6..ad958625d6 100755
--- a/examples/scripts/perl/modify_samba_config.pl
+++ b/examples/scripts/shares/perl/modify_samba_config.pl
diff --git a/examples/scripts/python/SambaConfig.py b/examples/scripts/shares/python/SambaConfig.py
index c70c23118a..c70c23118a 100644
--- a/examples/scripts/python/SambaConfig.py
+++ b/examples/scripts/shares/python/SambaConfig.py
diff --git a/examples/scripts/python/SambaParm.py b/examples/scripts/shares/python/SambaParm.py
index 292ad42cd2..292ad42cd2 100644
--- a/examples/scripts/python/SambaParm.py
+++ b/examples/scripts/shares/python/SambaParm.py
diff --git a/examples/scripts/python/generate_parm_table.py b/examples/scripts/shares/python/generate_parm_table.py
index 1dbc071e9b..1dbc071e9b 100755
--- a/examples/scripts/python/generate_parm_table.py
+++ b/examples/scripts/shares/python/generate_parm_table.py
diff --git a/examples/scripts/python/modify_samba_config.py b/examples/scripts/shares/python/modify_samba_config.py
index 6a4cdcab79..6a4cdcab79 100755
--- a/examples/scripts/python/modify_samba_config.py
+++ b/examples/scripts/shares/python/modify_samba_config.py
diff --git a/examples/scripts/python/smbparm.py b/examples/scripts/shares/python/smbparm.py
index 0dfcf0062e..0dfcf0062e 100644
--- a/examples/scripts/python/smbparm.py
+++ b/examples/scripts/shares/python/smbparm.py
diff --git a/examples/svr4-startup/README b/examples/svr4-startup/README
deleted file mode 100644
index 8ed9f74477..0000000000
--- a/examples/svr4-startup/README
+++ /dev/null
@@ -1,24 +0,0 @@
-Hi and thanks for this great software.
-
-Solaris (and other sysv) machines have a standardized way of
-starting and shutting down services (you may well know that already).
-
-Here's a piece of code one could place under /etc/init.d
-and create appropriate link from, say
-
-   /etc/rc2.d/S99samba.server
-
-to make smbd start and stop automatically with system bootups and
-shutdowns. Each one should edit the lines containing the
-daemon calls to agree with his/her installation (the code below
-works with the defaults) and workgroup  setup (we use the -G and -n
-options).
-
-
-I hope this will be of use --- at least it is for me.
-
-Yours,
-
-Timo Knuutila
-knuutila@cs.utu.fi
-
diff --git a/examples/svr4-startup/samba.server b/packaging/sysv/samba.init
index 0a47fdb10c..e021e911f6 100755
--- a/examples/svr4-startup/samba.server
+++ b/packaging/sysv/samba.init
@@ -1,7 +1,6 @@
 #!/bin/sh
-#ident  "@(#)samba.server 1.0   96/06/19 TK"    /* SVr4.0 1.1.13.1*/
 #
-# Please send info on modifications to knuutila@cs.utu.fi
+# Copyright (c) Timo Knuutila <knuutila@cs.utu.fi>     1996.
 #
 # This file should have uid root, gid sys and chmod 744
 #