Adding upstream version 3.118.upstream/3.118upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

8 files changed, 997 insertions, 0 deletions

diff --git a/examples/adduser.local.conf b/examples/adduser.local.conf
new file mode 100644
index 0000000..e89e468
--- /dev/null
+++ b/examples/adduser.local.conf
@@ -0,0 +1,617 @@
+############################################################################
+# /etc/adduser.local.conf: Configuration for /usr/local/sbin/adduser.local #
+############################################################################
+
+# [JNZ] Modified 21-Jun-2013
+
+# This file configures the local system additions to adduser(8) and should
+# be modified to suit local conditions.
+#
+# adduser.local is a script that configures a user's account for various
+# "services".  These services are simply convenient names for directories
+# that must be created, Unix groups to which the user must be added, files
+# that need to be copied and so on.
+#
+# Note that adduser(8) can now perform SOME of the tasks that adduser.local
+# does, particularly by using the EXTRA_GROUPS and ADD_EXTRA_GROUPS
+# variables in /etc/adduser.conf.  However, adduser.local is far more
+# flexible than doing just that...
+#
+# Please see the end of this file for an explanation of its syntax.
+
+
+######################
+#   Global Options   #
+######################
+
+# The skelother variable points to the "other" (secondary) skeletal
+# directory.  This directory is similar to /etc/skel (see the SKEL variable
+# in /etc/adduser.conf), except that files are not necessarily copied to the
+# home directory.
+
+skelother = /etc/skel.other
+
+# The dirmode variable specifies the octal mode used by chmod(1) for any
+# directories created by adduser.local.  Note, however, that such created
+# directories automatically inherit the SGID (set group ID) bit from their
+# parent directory.
+
+dirmode = 0755
+
+# The filemode variable specifies the octal mode used by chmod(1) for any
+# files created by adduser.local.
+
+filemode = 0644
+
+
+#####################
+#   USERS service   #
+#####################
+
+# Add the user to the Unix group "users".  Every user on this machine
+# should be a member of this group.  This is already done if the file
+# /etc/adduser.conf includes the setting "USERGROUPS=no".  If USERGROUPS
+# is set to "yes", you should uncomment the following three lines.
+
+service = users
+group[users] = users
+addtogroup[users] = true
+
+
+###################
+#   WWW service   #
+###################
+
+# Configure the WWW service for the user, a service that has a real UID
+# associated with it.  Assuming the user "www" has a GID of "www" and a
+# home directory of "/home/www" (in actual fact, the values are taken from
+# the password database), the following actions are performed:
+#
+#   - the user is added to the "www" group
+#   - the directory "/home/www/doc/users/$USER" is created, owned by
+#     the user, with group owner "www"
+#   - the link "public_html" is created to point to this directory
+#   - the file "/etc/skel.other/index.html" is copied to this directory
+#
+# This assumes that the system user "www" and group "www" are NOT the same
+# as the UID and GID of the web server ("www-data" on my system).  The "www"
+# account is for the web administrator.
+
+service = www
+
+user[www]       = www
+addtogroup[www] = true
+homedir[www]    = ""
+subdir[www]     = "doc/users"
+althome[www]    = false
+mkdir[www]      = true
+chgrpdir[www]   = true
+mklink[www]     = true
+linkname[www]   = "public_html"
+skelfile[www]   = "index.html"
+chgrpskel[www]  = true
+
+# If your web server's configuration follows the "other" (more common!)
+# standard for personal web pages (wherein the "public_html" directory is a
+# real directory in the user's home directory), you might want to use
+# something like the following:
+
+#service = www
+#homedir[www] = ""
+#subdir[www] = "public_html"
+#althome[www] = true
+#mkdir[www] = true
+#skelfile[www] = "index.html"
+
+
+###################
+#   FTP service   #
+###################
+
+# Configure the FTP service for the user in a similar way to the WWW
+# service above.  The only difference is that no skeleton file is copied.
+
+service = ftp
+
+user[ftp]       = ftp
+addtogroup[ftp] = true
+homedir[ftp]    = ""
+subdir[ftp]     = "doc/users"
+althome[ftp]    = false
+mkdir[ftp]      = true
+chgrpdir[ftp]   = true
+mklink[ftp]     = true
+linkname[ftp]   = "public_ftp"
+
+
+##############################
+#   Restricted FTP service   #
+##############################
+
+# Create the directory ~ftp/doc-restricted/users/$USER, owned by the user,
+# for the Restricted FTP service on the ZAP Group server.
+
+service = ftp_r
+
+user[ftp_r]     = ftp
+homedir[ftp_r]  = ""
+subdir[ftp_r]   = "doc-restricted/users"
+althome[ftp_r]  = false
+mkdir[ftp_r]    = true
+chgrpdir[ftp_r] = true
+
+
+####################
+#   DATA service   #
+####################
+
+# Create the directory /data/$USER, owned by the user.  This is only done
+# if /data exists (it is an ordinary directory, not a mount point).
+
+#service = data
+#homedir[data] = "/data"
+#subdir[data]  = ""
+#mounted[data] = false
+#mkdir[data]   = true
+
+
+#####################
+#   CDROM service   #
+#####################
+
+# Add the user to the Unix group "cdrom" (if it exists).  This allows the
+# user to access the CD-ROM hardware on the machine.
+
+service = cdrom
+group[cdrom] = cdrom
+addtogroup[cdrom] = true
+
+
+######################
+#   FLOPPY service   #
+######################
+
+# Add the user to the Unix group "floppy" (if it exists).  This allows the
+# user to access the floppy drive on the machine.
+
+service = floppy
+group[floppy] = floppy
+addtogroup[floppy] = true
+
+
+#####################
+#   AUDIO service   #
+#####################
+
+# Add the user to the Unix group "audio" (if it exists).  This allows the
+# user to access the audio hardware on the machine.
+
+service = audio
+group[audio] = audio
+addtogroup[audio] = true
+
+
+###################
+#   DIP service   #
+###################
+
+# Add the user to the Unix group "dip" (if it exists).  This allows the
+# user to dial out using the local modem.
+
+service = dip
+group[dip] = dip
+addtogroup[dip] = true
+
+
+#####################
+#   VIDEO service   #
+#####################
+
+# Add the user to the Unix group "video" (if it exists).  This allows the
+# user to use video devices plugged into the computer.
+
+service = video
+group[video] = video
+addtogroup[video] = true
+
+
+#######################
+#   PLUGDEV service   #
+#######################
+
+# Add the user to the Unix group "plugdev" (if it exists).  This allows
+# the user to use the pmount daemon with pluggable devices.
+
+service = plugdev
+group[plugdev] = plugdev
+addtogroup[plugdev] = true
+
+
+#######################
+#   SCANNER service   #
+#######################
+
+# Add the user to the Unix group "scanner" (if it exists).  This allows
+# the user to use any attached scanners.
+
+service = scanner
+group[scanner] = scanner
+addtogroup[scanner] = true
+
+
+###########################
+#   Syntax of this file   #
+###########################
+
+# The syntax of this file will be familiar to anyone who has used a
+# scripting language before.  This file is processed line by line, with each
+# line either being blank (and hence ignored), a comment or a configuration
+# variable.
+#
+# Comment lines (such as this one) begin with a hash character ("#") and
+# continue to the end of the line.  The hash character may be preceded by
+# white space.  Comment lines, like blank lines, are ignored.
+#
+# All lines that are not blank or are comment lines contain configuration
+# variables (one per line, with no comments allowed).  A configuration
+# variable has one of two forms:
+#
+#     VARIABLE = VALUE
+#     VARIABLE[SERVICE] = VALUE
+#
+# The first form is for global variables, while the second form is for
+# variables associated with a particular service.  Both the variable name
+# and the service name are alphanumeric strings and are case sensitive (ie,
+# the names "SKELOTHER", "skelother" and "SkelOther" refer to three
+# different variables).
+#
+# The value is typically a string which may or may not be case sensitive.
+# It may be (but usually does not need to be) surrounded by single or double
+# quotes, in which case everything within the quotes is part of the value.
+# Note that white space may surround the variable, service and value
+# components; such white space is discarded, unless it appears in quotes.
+# You may NOT use backslash to quote quote characters!
+#
+# If a value required is a boolean, "0", "false", "f", "no" and "n" are
+# treated as the false value, while "1", "true", "t", "yes" and "y" are
+# treated as the true value.  In both cases, the value is case-insensitive.
+#
+#
+# GLOBAL VARIABLES:
+# =================
+#
+# The following global variables are available:
+#
+#     skelother
+#     dirmode
+#     filemode
+#
+# These are described in the section "Global Options" above.
+#
+#
+# SERVICE VARIABLES:
+# ==================
+#
+# The main role of adduser.local is to configure a user's account for
+# various "services".  These services are simply convenient names for
+# directories that must be created, Unix groups to which the user must be
+# added, files that need to be copied and so on.
+#
+# adduser.local is informed of the existence of a service by the "service"
+# global variable:
+#
+#     service = SERVICENAME
+#
+# The service name SERVICENAME may be any case-sensitive alphanumeric
+# string.  Examples used within this file are "www" and "data".  Service
+# names need not correspond to any real service --- they are completely
+# internal to adduser.local, and are only used as a key for service
+# variables.  The "service" global variable may appear multiple times, each
+# time with a different service name.
+#
+# The order of the "service" global variables IS important, as that is the
+# order in which those services are created.  This is important if one
+# service depends on a prior one having been set up.
+#
+# The "service" global variable must appear before any of the services
+# variables for that service are defined.
+#
+# The following service variables are available, and may be specified in any
+# order:
+#
+#     user
+#     group
+#     addtogroup
+#     homedir
+#     subdir
+#     althome
+#     mounted
+#     mkdir
+#     chgrpdir
+#     mklink
+#     linkname
+#     skelfile
+#     chgrpskel
+#
+# Remember that each service variable is followed by a service name in
+# square brackets.  In the following explanations, "SVC" is used as a
+# sample service name.
+#
+#
+# user[SVC] = USER
+#
+#     Specifies that the service belongs to a real user, and that that
+#     service user name is USER.  This user name must appear in the password
+#     database file either in the first field (ie, a user name) or in the
+#     third (ie, a numeric UID).
+#
+#     Specifying a user name or UID also sets default values for the
+#     "group" and "homedir" service variables.  These default values are
+#     taken from the password database (the "homedir" variable is only set
+#     if the "althome" variable is set to false).
+#
+#
+# group[SVC] = GROUP
+#
+#     Specifies that the service's group name is GROUP.  This group name
+#     must appear in the group database file either in the first field (ie,
+#     a group name) or in the third (ie, a numeric GID).
+#
+#     If this variable is not specified, or is specified with GROUP as an
+#     empty string "", and the user variable is specified (and points to a
+#     valid user), the group name is taken to be the service user's default
+#     group.  For example, if "user[svc] = mail" were to be specified, and
+#     group[svc] were not, the group used would be default group for the
+#     user "mail" (which happens to be GID 8, ie, "mail").
+#
+#     This group is also used for the group owner of directories, links
+#     and copied files, depending on the settings of the "chgrpdir" and
+#     "chgrpskel" variables.
+#
+#
+# addtogroup[SVC] = BOOLEAN
+#
+#     Instructs whether to add the user to the group specified by the
+#     "group" variable or implied by the "user" variable.  If true,
+#     adduser.local adds the user to the group, assuming that the group,
+#     in fact, exists.
+#
+#     If this variable is not specified, false is assumed.
+#
+#
+# homedir[SVC] = PATH
+#
+#     Specifies the service's home directory as an absolute path name (ie,
+#     starting from "/").  The service's home directory is used to check if
+#     it is a mount point, as well as a base directory for the "mkdir" and
+#     "skelfile" variables.  If the directory does not exist, those
+#     variables take no effect.
+#
+#     If this variable is not specified, or is specified with PATH as an
+#     empty string "", the value used for the service's home directory is
+#     calculated in one of two ways.  The first method is to use the home
+#     directory of the service user; the second is to use the home directory
+#     of the user for whom adduser.local was called.
+#
+#     The first method is used when the "althome" variable is set to false
+#     and the "user" variable is specified (and points to a valid user).
+#     For example, if "user[svc] = www" and "althome[svc] = false" were to
+#     be specified, the default value of the "homedir" variable would be
+#     taken from www's home directory, typically "/var/www".
+#
+#     The second method is used when the "althome" variable is true.  For
+#     example, if adduser.local were to be called for the user "anna", and
+#     "althome" were set to true, the "homedir" variable would be set to the
+#     home directory of anna, typically "/home/anna".
+#
+#     Note that neither of these methods is used if the "homedir" variable
+#     is set to anything other than an empty string; in such a case, the
+#     specified value for the variable is always used.
+#
+#
+# subdir[SVC] = PATH
+#
+#     Specifies a subdirectory off the home directory.  This subdirectory is
+#     used for creating the new directory, copying the skeleton file and for
+#     the destination of the link.
+#
+#     If the "althome" variable is set to false, the subdirectory must
+#     already exist and is used in conjunction with the home directory and
+#     the user's name (for whom adduser.local was called).  For example, if
+#     the following were to be specified:
+#
+#         homedir[svc] = /media/zip
+#         subdir[svc] = home
+#         althome[svc] = false
+#         mkdir[svc] = true
+#
+#     and the user's name (for whom adduser.local was called) was "james",
+#     the directory "/media/zip/home/james" would be created.
+#
+#     If, on the other hand, the "althome" variable was set to true, the
+#     subdirectory is used only in conjunction with the home directory; it
+#     is THAT directory that is created.  For example, if the following were
+#     to be specified:
+#
+#         althome[svc] = true
+#         subdir[svc] = "public_html"
+#         mkdir[svc] = true
+#
+#     and adduser.local were called for the user "kathy" (who had the home
+#     directory "/home/kathy"), the directory "/home/kathy/public_html"
+#     would be created.
+#
+#     If this variable is not specified, blank is assumed.
+#
+#
+# althome[SVC] = BOOLEAN
+#
+#     Specifies whether the default value for the "homedir" variable is to
+#     be taken from the service's home directory or from the user's home
+#     directory (for whom adduser.local was called).  If false, the
+#     service's home directory (implied by the "user" setting) is used.  If
+#     true, the actual user's home directory is used.
+#
+#     This variable also controls whether or not the user's login name is
+#     used as part of the directory created by the "mkdir" variable and used
+#     by the "mklink" and "skelfile" variables.  See "homedir" and "mklink"
+#     for more details.
+#
+#     If this variable is not specified, false is assumed.
+#
+#
+# mounted[SVC] = BOOLEAN
+#
+#     Specifies whether to check if the directory specified by the
+#     "homedir" variable (or implied by other variables) is mounted or
+#     not.  A directory is mounted if it, or any parent directory, is
+#     mounted (excluding the root directory, which is always mounted).
+#     For example, if the following were to be specified (and the user's
+#     name were "alice"):
+#
+#         homedir[svc] = /home/external/server/ftp
+#         subdir[svc] = doc/users
+#         mounted[svc] = true
+#         mkdir[svc] = true
+#
+#     then the directory "/home/external/server/ftp/doc/users/alice" would
+#     be created only if either "/home/external/server/ftp",
+#     "/home/external/server", "/home/external" or "/home" were mounted.
+#
+#     If this variable is not specified, false is assumed (ie, the mount
+#     check is NOT performed).
+#
+#     Note that "checking for mounting" is defined as examining the contents
+#     of /proc/mounts.  It does NOT actually attempt to mount the
+#     directories.
+#
+#
+# mkdir[SVC] = BOOLEAN
+#
+#     Directs adduser.local whether or not to create the directory specified
+#     by the "homedir" and "subdir" variables.  If the "althome" variable is
+#     false, the directory that is created has the user's login name at the
+#     end.  In all cases, the newly created directory belongs to that user.
+#     For example, if adduser.local was called for the user "david", and the
+#     following lines were to be specified:
+#
+#         homedir[data1] = "/data/1"
+#         subdir[data1] = "users"
+#         althome[data1] = false
+#         mkdir[data1] = true
+#
+#     then the directory "/data/1/users/david" would be created, owned by
+#     the user "david".  If, on the other hand, the following were to be
+#     specified (for the same user "david"):
+#
+#         subdir[www] = "public_html"
+#         althome[www] = true
+#         mkdir[www] = true
+#
+#     then the directory "/home/david/public_html" would be created
+#     (assuming "/home/david" was david's home directory), owned by the
+#     user "david".
+#
+#     The mode of the directory is taken from the "dirmode" global variable
+#     in this configuration file.  See also the comment on that global
+#     variable.
+#
+#     The group owner of the directory is either the same as the user's (in
+#     this case, if the user "david" was in the group "users" by default,
+#     then the group owner would be "users"), or the same as the service
+#     user's group (see the "group" variable for more information).  The
+#     "chgrpdir" variable specifies which of these two options is used.
+#
+#     If this variable is not specified, false is assumed.
+#
+#
+# chgrpdir[SVC] = BOOLEAN
+#
+#     Specifies the group owner of any directory and link created by the
+#     "mkdir" and "mklink" variables respectively.  If true is specified,
+#     the group owner is the same as specified by the "group" variable (or
+#     implied by the "user" variable).  If false is specified, the group
+#     owner is the same as the actual user's default group.
+#
+#     If this variable is not specified, false is assumed.
+#
+#
+# mklink[SVC] = BOOLEAN
+#
+#     Specifies whether or not to create a symbolic link to the created
+#     directory (see "mkdir" above) in the actual user's home directory.
+#     The name of the link is taken from the "linkname" variable below.  For
+#     example, if the following were to be specified, and adduser.local were
+#     called for the user "mark":
+#
+#         homedir[data1] = "/data/1"
+#         subdir[data1] = "users"
+#         althome[data1] = false
+#         mkdir[data1] = true
+#         mklink[data1] = true
+#         linkname[data1] = "data1"
+#
+#     then, not only would the directory "/data/1/users/mark" be created,
+#     but the symbolic link "data1" would be created in his home directory
+#     as well, pointing to that directory (that is, "/home/mark/data1" ->
+#     "/data/1/users/mark").
+#
+#     If this variable is not specified, false is assumed.
+#
+#
+# linkname[SVC] = PATH
+#
+#     Specifies the name of the symbolic link created in the user's home
+#     directory, as demonstrated in the example above.  If PATH includes
+#     subdirectories, these subdirectories must already exist before the
+#     symbolic link is created; these can be created by other services prior
+#     to this one.
+#
+#     If the "mklink" variable is true, and the "linkname" variable is not
+#     specified, or is an empty string "", the name of the service is used
+#     (as specified by the "service" global variable).
+#
+#
+# skelfile[SVC] = PATH
+#
+#     Instructs adduser.local to copy the file PATH from the "skelother"
+#     skeleton directory (see the global variable of that name) into the
+#     newly-created directory specified by the "mkdir" variable.  For
+#     example, if adduser.local was called for the user "nina", and the
+#     following lines were to be specified:
+#
+#         homedir[www] = "/home/www"
+#         subdir[www] = "doc/users"
+#         althome[www] = false
+#         mkdir[www] = true
+#         skelfile[www] = "index.html"
+#
+#     then the directory "/home/www/doc/users/nina" would be created and the
+#     file "index.html" would be copied from /etc/skel.other (assuming this
+#     is the directory specified by the "skelother" global variable) into
+#     that newly-created directory.
+#
+#     The newly-copied file will have a mode as specified by the "filemode"
+#     global variable, and its group owner will either be the default group
+#     of the user, or the group as specified by the "group" variable or
+#     implied by the "user" variable.  See the "chgrpskel" variable below.
+#
+#     If this variable is not specified, or PATH is an empty string "", no
+#     file is copied.  If a file of that name already exists, it is NOT
+#     overwritten.  Only one file may be specified in any given service; if
+#     more are needed, simply create additional services with matching
+#     "homedir", "subdir", "althome" and "mkdir" variables.
+#
+#
+# chgrpskel[SVC] = BOOLEAN
+#
+#     Determines whether or not adduser.local changes the group owner of the
+#     copied skeleton file (specified by the "skelfile" variable above) to
+#     the group specified by the "group" variable or implied by the "user"
+#     variable.  If this variable is false, the default group of the user
+#     remains the group owner.
+#
+#     If this variable is not specified, false is assumed.
+#
+#
+# End of /etc/adduser.local.conf.
diff --git a/examples/adduser.local.conf.examples/adduser.conf b/examples/adduser.local.conf.examples/adduser.conf
new file mode 100644
index 0000000..a3b914e
--- /dev/null
+++ b/examples/adduser.local.conf.examples/adduser.conf
@@ -0,0 +1,90 @@
+# /etc/adduser.conf: `adduser' configuration.
+# See adduser(8) and adduser.conf(5) for full documentation.
+
+# [JNZ] Modified 21-Jun-2013
+
+# Modified from the version shipped with adduser(8) by John Zaitseff.
+# These modifications are released into the public domain.
+
+# The DSHELL variable specifies the default login shell on your
+# system.
+DSHELL=/bin/bash
+
+# The DHOME variable specifies the directory containing users' home
+# directories.
+DHOME=/home
+
+# If GROUPHOMES is "yes", then the home directories will be created as
+# /home/groupname/user.
+GROUPHOMES=no
+
+# If LETTERHOMES is "yes", then the created home directories will have
+# an extra directory - the first letter of the user name. For example:
+# /home/u/user.
+LETTERHOMES=no
+
+# The SKEL variable specifies the directory containing "skeletal" user
+# files; in other words, files such as a sample .profile that will be
+# copied to the new user's home directory when it is created.
+SKEL=/etc/skel
+
+# FIRST_SYSTEM_[GU]ID to LAST_SYSTEM_[GU]ID inclusive is the range for UIDs
+# for dynamically allocated administrative and system accounts/groups.
+# Please note that system software, such as the users allocated by the
+# base-passwd package, may assume that UIDs less than 100 are unallocated.
+FIRST_SYSTEM_UID=100
+LAST_SYSTEM_UID=999
+
+FIRST_SYSTEM_GID=100
+LAST_SYSTEM_GID=999
+
+# FIRST_[GU]ID to LAST_[GU]ID inclusive is the range of UIDs of dynamically
+# allocated user accounts/groups.
+FIRST_UID=1000
+LAST_UID=59999
+
+FIRST_GID=1000
+LAST_GID=59999
+
+# The USERGROUPS variable can be either "yes" or "no".  If "yes" each
+# created user will be given their own group to use as a default.  If
+# "no", each created user will be placed in the group whose gid is
+# USERS_GID (see below).
+USERGROUPS=yes
+
+# If USERGROUPS is "no", then USERS_GID should be the GID of the group
+# `users' (or the equivalent group) on your system.
+USERS_GID=100
+
+# If DIR_MODE is set, directories will be created with the specified
+# mode. Otherwise the default mode 0755 will be used.
+DIR_MODE=0755
+
+# If SETGID_HOME is "yes" home directories for users with their own
+# group the setgid bit will be set. This was the default for
+# versions << 3.13 of adduser. Because it has some bad side effects we
+# no longer do this per default. If you want it nevertheless you can
+# still set it here.
+SETGID_HOME=no
+
+# If QUOTAUSER is set, a default quota will be set from that user with
+# `edquota -p QUOTAUSER newuser'
+QUOTAUSER=""
+
+# If SKEL_IGNORE_REGEX is set, adduser will ignore files matching this
+# regular expression when creating a new home directory
+SKEL_IGNORE_REGEX="dpkg-(old|new|dist|save)"
+
+# Set this if you want the --add_extra_groups option to adduser to add
+# new users to other groups.
+# This is the list of groups that new non-system users will be added to
+# Default:
+#EXTRA_GROUPS="dialout cdrom floppy audio video plugdev users"
+
+# If ADD_EXTRA_GROUPS is set to something non-zero, the EXTRA_GROUPS
+# option above will be default behavior for adding new, non-system users
+#ADD_EXTRA_GROUPS=1
+
+
+# check user and group names also against this regular expression.
+#NAME_REGEX="^[a-z][-a-z0-9_]*\$"
diff --git a/examples/adduser.local.conf.examples/bash.bashrc b/examples/adduser.local.conf.examples/bash.bashrc
new file mode 100644
index 0000000..de42139
--- /dev/null
+++ b/examples/adduser.local.conf.examples/bash.bashrc
@@ -0,0 +1,96 @@
+#########################################################################
+#      /etc/bash.bashrc: System-wide initialisation file for Bash       #
+#########################################################################
+
+# [JNZ] Modified 21-Jun-2013
+
+# This script file is sourced by bash(1) for interactive shells.  It is
+# also sourced by /etc/profile for (possibly non-interactive) login
+# shells.
+#
+# Written by John Zaitseff and released into the public domain.
+
+
+# Useful shell settings
+
+shopt -s checkwinsize expand_aliases
+set -P
+
+# Useful variable settings
+
+export LANG=en_AU.UTF-8				# We are in Australia
+export LC_ALL=en_AU.UTF-8
+export TIME_STYLE=$'+%b %e  %Y\n%b %e %H:%M'	# As used by ls(1)
+
+# Useful aliases, defined whether or not this shell is interactive
+
+alias cls=clear
+alias ls="ls -v"
+alias ll="ls -l"
+alias l.="ls -A"
+alias dir="ls -laF"
+alias e="emacs -nw"
+alias lo=libreoffice
+
+# Set a variable identifying any Debian Chroot Compilation Environment
+
+if [ -z "$debian_chroot" -a -r /etc/debian_chroot ]; then
+    export debian_chroot=$(cat /etc/debian_chroot)
+fi
+
+# Run the following only if this shell is interactive
+
+if [ "$PS1" ]; then
+
+    export HISTIGNORE="&: +.*"		# Forget commands starting with space
+    unset HISTFILE			# Don't save commands to history file
+    export LESSHISTFILE=-		# Don't save history for less(1)
+    export PROMPT_DIRTRIM=2		# Trailing directory components to keep
+
+    # Make less(1) more friendly for non-text input files
+    if [ -x /usr/bin/lesspipe ]; then
+	eval $(/usr/bin/lesspipe)
+    fi
+
+    # Allow the Debian Chroot Compilation Environment to modify the prompt
+    if [ -z "$debian_chroot" ]; then
+	PS1h="\h"
+    else
+	PS1h="($debian_chroot)"
+    fi
+
+    # Set options depending on terminal type
+    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
+	# The terminal supports colour: assume it complies with ECMA-48
+	# (ISO/IEC-6429).  This is almost always the case...
+
+	# Make ls(1) use colour in its listings
+	if [ -x /usr/bin/dircolors ]; then
+	    alias ls="ls -v --color=auto"
+	    eval $(/usr/bin/dircolors --sh)
+	fi
+
+        # Set the terminal prompt
+        if [ $(id -u) -ne 0 ]; then
+            PS1="\[\e[42;30m\]\u@$PS1h\[\e[37m\]:\[\e[30m\]\w\[\e[0m\] \\\$ "
+        else
+            # Root user gets a nice RED prompt!
+            PS1="\[\e[41;37;1m\]\u@$PS1h\[\e[30m\]:\[\e[37m\]\w\[\e[0m\] \\\$ "
+        fi
+    else
+	# The terminal does not support colour
+	PS1="\u@$PS1h:\w \\\$ "
+    fi
+
+    # Allow bash(1) completion in interactive shells
+
+    if ! shopt -oq posix; then
+	if [ -f /usr/share/bash-completion/bash_completion ]; then
+	    . /usr/share/bash-completion/bash_completion
+	elif [ -f /etc/bash_completion ]; then
+	    . /etc/bash_completion
+	fi
+    fi
+
+    unset PS1h
+fi
diff --git a/examples/adduser.local.conf.examples/profile b/examples/adduser.local.conf.examples/profile
new file mode 100644
index 0000000..2c2b70a
--- /dev/null
+++ b/examples/adduser.local.conf.examples/profile
@@ -0,0 +1,88 @@
+#########################################################################
+#    /etc/profile: System-wide initialisation file for Bourne shells    #
+#########################################################################
+
+# [JNZ] Modified 21-Jun-2013
+
+# This script file is sourced by Bourne-compatible shells, such as sh(1),
+# bash(1), ksh(1) and ash(1), when those shells are run as a login shell.
+#
+# When a login shell starts, the following script files are sourced, in
+# this order:
+#
+#   /etc/profile          - this file
+#   /etc/profile.d/*.sh   - additional profile scripts
+#   /etc/bash.bashrc      - sourced by this file (only for bash(1))
+#   $HOME/.bash_profile   - run by bash(1)
+#   $HOME/.bashrc         - sourced by the default $HOME/.bash_profile
+#
+# When a normal (non-login) bash(1) shell starts, the following files are
+# sourced:
+#
+#   /etc/bash.bashrc      - run by bash(1)
+#   $HOME/.bashrc         - run by bash(1)
+#
+# Written by John Zaitseff and released into the public domain.
+
+
+umask 022
+
+# Set the default executable path, as ENV_PATH and ENV_SUPATH in
+# /etc/login.defs does not always seem to be consulted
+
+if [ "`id -u`" -eq 0 ]; then
+    PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+else
+    PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games"
+fi
+
+# Augment various paths as required
+
+if [ -d $HOME/bin ]; then
+    PATH=$HOME/bin:$PATH
+fi
+
+if [ -d $HOME/man ]; then
+    MANPATH=$HOME/man:$MANPATH
+    export MANPATH
+fi
+if [ -d $HOME/lib/man ]; then
+    MANPATH=$HOME/lib/man:$MANPATH
+    export MANPATH
+fi
+
+export PATH
+
+# Set the default prompt for interactive shells
+
+if [ "$PS1" ]; then
+    if [ "$BASH" ] && [ "$BASH" != "/bin/sh" ]; then
+	PS1="\u@\h:\w \\\$ "
+    else
+	if [ "`id -u`" -eq 0 ]; then
+	    PS1='# '
+	else
+	    PS1='$ '
+	fi
+    fi
+fi
+
+# Source all *.sh scripts in /etc/profile.d
+
+if [ -d /etc/profile.d ]; then
+    for i in /etc/profile.d/*.sh; do
+	if [ -r "$i" ]; then
+	    . "$i"
+	fi
+    done
+    unset i
+fi
+
+# If this is a bash(1) shell, source an additional initialisation script.
+# This may override variables, functions and aliases set above.
+
+if [ "$BASH" ] && [ "$BASH" != "/bin/sh" ]; then
+    if [ -r /etc/bash.bashrc ]; then
+	. /etc/bash.bashrc
+    fi
+fi
diff --git a/examples/adduser.local.conf.examples/skel.other/index.html b/examples/adduser.local.conf.examples/skel.other/index.html
new file mode 100644
index 0000000..d4eb6be
--- /dev/null
+++ b/examples/adduser.local.conf.examples/skel.other/index.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+
+<!-- This document is a place-holder for the home page until the user
+     gets around to replacing it with his or her own.
+
+     [JNZ] Modified 21-Jun-2013
+
+     Written by John Zaitseff and released into the public domain.  -->
+
+<head>
+  <title>My Home Page</title>
+  <meta charset="UTF-8" />
+  <meta name="author" content="The user">
+  <meta name="description" content="The user's default home page">
+  <meta name="keywords" content="home, homepage, default">
+</head>
+
+<body>
+
+<h1>My Home Page</h1>
+
+<p>Welcome to my home page on the World Wide Web!  This page, like so
+many others, is under construction.  I&rsquo;ll be replacing this page
+soon&hellip; I hope.</p>
+
+</body>
+</html>
diff --git a/examples/adduser.local.conf.examples/skel/dot.bash_logout b/examples/adduser.local.conf.examples/skel/dot.bash_logout
new file mode 100644
index 0000000..922c64b
--- /dev/null
+++ b/examples/adduser.local.conf.examples/skel/dot.bash_logout
@@ -0,0 +1,10 @@
+#########################################################################
+#           ~/.bash_logout: Personal log-out script for Bash            #
+#########################################################################
+
+# [JNZ] Modified 21-Jun-2013
+
+# This script file is sourced by bash(1) when the login shell terminates.
+# By default, no action is taken.
+#
+# Written by John Zaitseff and released into the public domain.
diff --git a/examples/adduser.local.conf.examples/skel/dot.bash_profile b/examples/adduser.local.conf.examples/skel/dot.bash_profile
new file mode 100644
index 0000000..d8b0331
--- /dev/null
+++ b/examples/adduser.local.conf.examples/skel/dot.bash_profile
@@ -0,0 +1,45 @@
+#########################################################################
+#       ~/.bash_profile: Personal initialisation script for Bash        #
+#########################################################################
+
+# [JNZ] Modified 21-Jun-2013
+
+# This script file is sourced by bash(1) for login shells.
+#
+# When a login shell starts, the following script files are sourced, in
+# this order:
+#
+#   /etc/profile          - run by bash(1)
+#   /etc/profile.d/*.sh   - additional profile scripts
+#   /etc/bash.bashrc      - sourced by /etc/profile file (only for bash(1))
+#   $HOME/.bash_profile   - this file
+#   $HOME/.bashrc         - sourced by this file (if unchanged)
+#
+# When a normal (non-login) bash(1) shell starts, the following files are
+# sourced:
+#
+#   /etc/bash.bashrc      - run by bash(1)
+#   $HOME/.bashrc         - run by bash(1)
+#
+# Written by John Zaitseff and released into the public domain.
+
+
+if [ -f $HOME/.bashrc ]; then
+    . $HOME/.bashrc
+fi
+
+# Display a verse from the Bible
+
+if [ ! -f $HOME/.hushlogin ] && [ ! -f $HOME/.hushverse ]; then
+    if [ $(type -p verse) ]; then
+	echo
+	verse
+	echo
+    fi
+fi
+
+# Turn on talk(1) messages, unless the user does not want this
+
+if [ ! -f $HOME/.hushlogin ] && [ ! -f $HOME/.hushtalk ]; then
+    mesg y 2>/dev/null
+fi
diff --git a/examples/adduser.local.conf.examples/skel/dot.bashrc b/examples/adduser.local.conf.examples/skel/dot.bashrc
new file mode 100644
index 0000000..36f56fe
--- /dev/null
+++ b/examples/adduser.local.conf.examples/skel/dot.bashrc
@@ -0,0 +1,23 @@
+#########################################################################
+#          ~/.bashrc: Personal initialisation script for Bash           #
+#########################################################################
+
+# [JNZ] Modified 21-Jun-2013
+
+# This script file is sourced by interactive Bash shells (ie, shells for
+# which you are able to provide keyboard input).  It is also sourced by
+# ~/.bash_profile for login shells.  It is the best place to put shell
+# variables, functions and aliases.
+#
+# Written by John Zaitseff and released into the public domain.
+
+
+# Variable settings for your convenience
+
+export EDITOR=emacs				# Everyone's favourite editor
+
+# Run the following only if this shell is interactive
+
+if [ "$PS1" ]; then
+    export IGNOREEOF=5				# Disallow accidental Ctrl-D
+fi