[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Sun May 26 21:52:03 MDT 2013
The branch, master has been updated
via 940a6a6 lib/replace: Remove unused install-sh
via 7926330 build: Remove unused expand-includes.pl
via a153eb0 build: Remove old create-tarball release script
via 8903103 build: Do not always regenerate the version.h file
via cbb833d smbd: Fix build on platforms that will not support var = {} initialisation
via d41ec68 examples: Remove browser and DC settings from example smb.conf
via 02ee9e4 examples: Remove password server from example smb.conf
via 8a06c3d examples: Remove default printing form example smb.conf
via 2a110aa examples: Move example smb.conf over to "server role"
via 2a4eaa3 build: Rework BSD_STYLE_STATVFS check to match autoconf build
via c6673b9 build: Remove binaries and libraries build groups
via dfe73e7 build: Build all of samba in autoconf make test
from 8bf3112 s4:idmap: break account_type check lines for readability in idmap_sid_to_xid()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 940a6a62058a6bbd5f32ac1e1eba11b37d411401
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu May 23 13:17:19 2013 +1000
lib/replace: Remove unused install-sh
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Mon May 27 05:51:04 CEST 2013 on sn-devel-104
commit 792633006002ef62bf35a0279cad7fbd60520077
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu May 23 09:51:03 2013 +1000
build: Remove unused expand-includes.pl
We no longer have makefiles with includes.
Andrew Bartlett
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
commit a153eb0d2198a774f7c046f9e96c73d55405877e
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu May 23 09:38:47 2013 +1000
build: Remove old create-tarball release script
Releases are now done via "waf dist" and script/librelease.sh.
Andrew Bartlett
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
commit 8903103bd691c3927a644ed9162d6412df9ffeea
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu May 23 09:33:19 2013 +1000
build: Do not always regenerate the version.h file
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
commit cbb833d78e48953b3a04c0463f68c5370f2d4187
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 07:37:33 2013 +1000
smbd: Fix build on platforms that will not support var = {} initialisation
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
commit d41ec68601cfca67874f78d2f64784904d1530da
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 00:13:52 2013 +1000
examples: Remove browser and DC settings from example smb.conf
These examples just encourage folks to set browing values that are not needed.
The domain logons setting is already covered by the server role at the
top of the file and logon script is not special enough to be in the
default smb.conf.
Andrew Bartlett
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
commit 02ee9e4d8a2befe3fa27bc8be211c80a99767f34
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 00:12:23 2013 +1000
examples: Remove password server from example smb.conf
This should discourage folks from setting it when they do not really need it.
Andrew Bartlett
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
commit 8a06c3dd79af0165c8701a465c3f8483ada89a83
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 00:11:32 2013 +1000
examples: Remove default printing form example smb.conf
These settings are all defaults, and just work for most systems. Users on other platforms
can read man smb.conf, rather than cluttering up this file.
Andrew Bartlett
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
commit 2a110aaecad5439534eacfc91b607a3c3653e81d
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 00:10:39 2013 +1000
examples: Move example smb.conf over to "server role"
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
commit 2a4eaa3241fc4ccb79359ea4e4d511754a84d46b
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 00:14:29 2013 +1000
build: Rework BSD_STYLE_STATVFS check to match autoconf build
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
commit c6673b96a59e38031da6654580250bbc58766cfd
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sun May 26 23:11:03 2013 +1000
build: Remove binaries and libraries build groups
Build groups are used in Samba to ensure that even if the dependency
chain for a target is not perfect, that it builds reliably. This
matters most in the early build stages, where we are building the asn1
compiler and autogenerating files.
Once we get to the main stage, dependencies between C files, libraries
and binaries are much clearer, because the C compiler and linker takes
these as inputs anyway.
Groups were added to our waf build for stability during early
development, as dependency information was first imported from the
previous autoconf/perl based build system.
I don't think we need this distinction in the main build of C files
into .o, and when linking these into binaries, because the invocation
of these tools is very well defined, and we will find any missing
inputs very quickly.
As such, I've removed the libraries and binaries targets,
consolidating them with 'main'
By making this change, a build of smbtorture only on a clean tree
drops from 3778 to 2489 targets, and much of the expensive linker
stage is skipped. The time for a null build of smbtorture only also
drops from 4.673s to as low as 2.499s on my laptop.
Andrew Bartlett
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
commit dfe73e7885a40de8c24d1231365a16f7aa3d5073
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 27 08:27:44 2013 +1000
build: Build all of samba in autoconf make test
The test system actually depends on far more than smbtorture these days
and this was masked by the build groups. Rather than try and specify
everything that could be used, just build the lot (which is what was
essentially being done anyway).
This prepares for the removal of the libraries and binaries build
groups, to assist in improving waf performance for single-binary builds.
Andrew Bartlett
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_patterns.py | 6 +-
buildtools/wafsamba/wafsamba.py | 6 +-
examples/smb.conf.default | 70 ++--------
lib/replace/install-sh | 238 ---------------------------------
lib/util/wscript_configure | 22 ++--
release-scripts/create-tarball | 235 --------------------------------
source3/Makefile-smbtorture | 2 +-
source3/script/expand-includes.pl | 30 ----
source3/smbd/posix_acls.c | 5 +-
source4/heimdal_build/wscript_build | 4 +-
10 files changed, 35 insertions(+), 583 deletions(-)
delete mode 100755 lib/replace/install-sh
delete mode 100755 release-scripts/create-tarball
delete mode 100755 source3/script/expand-includes.pl
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_patterns.py b/buildtools/wafsamba/samba_patterns.py
index 4db5eea..55ed540 100644
--- a/buildtools/wafsamba/samba_patterns.py
+++ b/buildtools/wafsamba/samba_patterns.py
@@ -21,11 +21,15 @@ def write_version_header(task):
def SAMBA_MKVERSION(bld, target):
'''generate the version.h header for Samba'''
+
+ # We only force waf to re-generate this file if we are installing,
+ # because only then is information not included in the deps (the
+ # git revision) included in the version.
t = bld.SAMBA_GENERATOR('VERSION',
rule=write_version_header,
source= 'VERSION',
target=target,
- always=True)
+ always=bld.is_install)
t.env.is_install = bld.is_install
Build.BuildContext.SAMBA_MKVERSION = SAMBA_MKVERSION
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 3559cc1..2ef68b1 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -110,7 +110,7 @@ def SAMBA_LIBRARY(bld, libname, source,
realname=None,
autoproto=None,
autoproto_extra_source='',
- group='libraries',
+ group='main',
depends_on='',
local_include=True,
global_include=True,
@@ -306,7 +306,7 @@ def SAMBA_BINARY(bld, binname, source,
use_hostcc=False,
use_global_deps=True,
compiler=None,
- group='binaries',
+ group='main',
manpages=None,
local_include=True,
global_include=True,
@@ -629,8 +629,6 @@ def SETUP_BUILD_GROUPS(bld):
bld.add_group('headers')
bld.add_group('main')
bld.add_group('symbolcheck')
- bld.add_group('libraries')
- bld.add_group('binaries')
bld.add_group('syslibcheck')
bld.add_group('final')
Build.BuildContext.SETUP_BUILD_GROUPS = SETUP_BUILD_GROUPS
diff --git a/examples/smb.conf.default b/examples/smb.conf.default
index dad8c97..bb9c2e2 100644
--- a/examples/smb.conf.default
+++ b/examples/smb.conf.default
@@ -28,10 +28,16 @@
# server string is the equivalent of the NT Description field
server string = Samba Server
-# Security mode. Defines in which mode Samba will operate. Possible
-# values are user, domain and ads. Most people will want
-# user level security. See the Samba-HOWTO-Collection for details.
- security = user
+# Server role. Defines in which mode Samba will operate. Possible
+# values are "standalone server", "member server", "classic primary
+# domain controller", "classic backup domain controller", "active
+# directory domain controller".
+#
+# Most people will want "standalone sever" or "member server".
+# Running as "active directory domain controller" will require first
+# running "samba-tool domain provision" to wipe databases and create a
+# new domain.
+ server role = standalone server
# This option is important for security. It allows you to restrict
# connections to machines which are on your local network. The
@@ -40,23 +46,6 @@
# the smb.conf man page
; hosts allow = 192.168.1. 192.168.2. 127.
-# If you want to automatically load your printer list rather
-# than setting them up individually then you'll need this
- load printers = yes
-
-# you may wish to override the location of the printcap file
-; printcap name = /etc/printcap
-
-# on SystemV system setting printcap name to lpstat should allow
-# you to automatically obtain a printer list from the SystemV spool
-# system
-; printcap name = lpstat
-
-# It should not be necessary to specify the print system type unless
-# it is non-standard. Currently supported print systems include:
-# bsd, cups, sysv, plp, lprng, aix, hpux, qnx
-; printing = cups
-
# Uncomment this if you want a guest account, you must add this to /etc/passwd
# otherwise the user "nobody" is used
; guest account = pcguest
@@ -68,15 +57,7 @@
# Put a capping on the size of the log files (in Kb).
max log size = 50
-# Use password server option only with security = server
-# The argument list may include:
-# password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name]
-# or to auto-locate the domain controller/s
-# password server = *
-; password server = <NT-Server-Name>
-
-# Use the realm option only with security = ads
-# Specifies the Active Directory realm the host is part of
+# Specifies the Kerberos or Active Directory realm the host is part of
; realm = MY_REALM
# Backend to store user information in. New installations should
@@ -96,35 +77,6 @@
# here. See the man page for details.
; interfaces = 192.168.12.2/24 192.168.13.2/24
-# Browser Control Options:
-# set local master to no if you don't want Samba to become a master
-# browser on your network. Otherwise the normal election rules apply
-; local master = no
-
-# OS Level determines the precedence of this server in master browser
-# elections. The default value should be reasonable
-; os level = 33
-
-# Domain Master specifies Samba to be the Domain Master Browser. This
-# allows Samba to collate browse lists between subnets. Don't use this
-# if you already have a Windows NT domain controller doing this job
-; domain master = yes
-
-# Preferred Master causes Samba to force a local browser election on startup
-# and gives it a slightly higher chance of winning the election
-; preferred master = yes
-
-# Enable this if you want Samba to be a domain logon server for
-# Windows95 workstations.
-; domain logons = yes
-
-# if you enable domain logons then you may want a per-machine or
-# per user logon script
-# run a specific logon batch file per workstation (machine)
-; logon script = %m.bat
-# run a specific logon batch file per username
-; logon script = %U.bat
-
# Where to store roving profiles (only for Win95 and WinNT)
# %L substitutes for this servers netbios name, %U is username
# You must uncomment the [Profiles] share below
diff --git a/lib/replace/install-sh b/lib/replace/install-sh
deleted file mode 100755
index 5871924..0000000
--- a/lib/replace/install-sh
+++ /dev/null
@@ -1,238 +0,0 @@
-#! /bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-#
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
- case $1 in
- -c) instcmd="$cpprog"
- shift
- continue;;
-
- -d) dir_arg=true
- shift
- continue;;
-
- -m) chmodcmd="$chmodprog $2"
- shift
- shift
- continue;;
-
- -o) chowncmd="$chownprog $2"
- shift
- shift
- continue;;
-
- -g) chgrpcmd="$chgrpprog $2"
- shift
- shift
- continue;;
-
- -s) stripcmd="$stripprog"
- shift
- continue;;
-
- -t=*) transformarg=`echo $1 | sed 's/-t=//'`
- shift
- continue;;
-
- -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
- shift
- continue;;
-
- *) if [ x"$src" = x ]
- then
- src=$1
- else
- # this colon is to work around a 386BSD /bin/sh bug
- :
- dst=$1
- fi
- shift
- continue;;
- esac
-done
-
-if [ x"$src" = x ]
-then
- echo "install: no input file specified"
- exit 1
-else
- true
-fi
-
-if [ x"$dir_arg" != x ]; then
- dst=$src
- src=""
-
- if [ -d $dst ]; then
- instcmd=:
- else
- instcmd=mkdir
- fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad
-# if $src (and thus $dsttmp) contains '*'.
-
- if [ -f $src -o -d $src ]
- then
- true
- else
- echo "install: $src does not exist"
- exit 1
- fi
-
- if [ x"$dst" = x ]
- then
- echo "install: no destination specified"
- exit 1
- else
- true
- fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
- if [ -d $dst ]
- then
- dst="$dst"/`basename $src`
- else
- true
- fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-# this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
- pathcomp="${pathcomp}${1}"
- shift
-
- if [ ! -d "${pathcomp}" ] ;
- then
- $mkdirprog "${pathcomp}"
- else
- true
- fi
-
- pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
- $doit $instcmd $dst &&
-
- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
- if [ x"$transformarg" = x ]
- then
- dstfile=`basename $dst`
- else
- dstfile=`basename $dst $transformbasename |
- sed $transformarg`$transformbasename
- fi
-
-# don't allow the sed command to completely eliminate the filename
-
- if [ x"$dstfile" = x ]
- then
- dstfile=`basename $dst`
- else
- true
- fi
-
-# Make a temp file name in the proper directory.
-
- dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
- $doit $instcmd $src $dsttmp &&
-
- trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing. If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
- $doit $rmcmd -f $dstdir/$dstfile &&
- $doit $mvcmd $dsttmp $dstdir/$dstfile
-
-fi &&
-
-
-exit 0
diff --git a/lib/util/wscript_configure b/lib/util/wscript_configure
index 3cb2ffc..1270ab3 100644
--- a/lib/util/wscript_configure
+++ b/lib/util/wscript_configure
@@ -58,18 +58,16 @@ if not found_statfs:
print("FATAL: Failed to find a statfs method")
raise
-if conf.CONFIG_SET('STAT_STATFS2_BSIZE'):
- conf.CHECK_CODE("""#ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
- #endif
- #ifdef HAVE_SYS_MOUNT_H
- #include <sys/mount.h>
- #endif
- struct statfs fsd; fsd.f_iosize = 0;""",
- define='BSD_STYLE_STATVFS',
- msg='Checking for *bsd style statfs with statfs.f_iosize',
- execute=False,
- local_include=False)
+conf.CHECK_CODE("""struct statfs fsd;
+ fsd.f_bsize = 0;
+ fsd.f_iosize = 0;
+ return (statfs (".", &fsd));
+ """,
+ headers='sys/param.h sys/mount.h sys/vfs.h',
+ define='BSD_STYLE_STATVFS',
+ msg='Checking for *bsd style statfs with statfs.f_iosize',
+ execute=True,
+ local_include=False)
conf.CHECK_CODE('struct statvfs buf; buf.f_fsid = 0',
define='HAVE_FSID_INT',
diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
deleted file mode 100755
index e6a515f..0000000
--- a/release-scripts/create-tarball
+++ /dev/null
@@ -1,235 +0,0 @@
-#!/bin/bash
-
-## option defaults
-OPT_BRANCH=""
-OPT_DOCSDIR=""
-OPT_KEYID=""
-
-TOPDIR="`dirname $0`/.."
-VER_H="${TOPDIR}/source3/include/version.h"
-
-function exitOnError
-{
- local _error="$1"
- local _msg="$2"
-
- if [ ${_error} -eq 0 ]; then
- return 0
- fi
-
- echo "FAILURE: ${_msg}"
- exit ${_error}
-}
-
-##
-## Print help usage
-##
-
-function printUsage
-{
- echo "Usage $0 [options]"
- echo " --help Print command usage"
- echo " --branch <name> Specify the branch to to create the archive file from"
- echo " --copy-docs <dir> Copy documentation from <dir> rather than building"
- echo " --keyid <email> The GnuPG key ID used to sign the release tag"
- echo ""
-}
-
-##
-## Parse the command line options
-##
-
-function parseOptions
-{
- while [ -n "$1" ]; do
- case "$1" in
- --help)
- printUsage
- exit 0
- ;;
- --branch)
- shift
- if [ -z "$1" ]; then
- printUsage
- return 1
- fi
- OPT_BRANCH="$1"
- shift
- ;;
- --copy-docs)
- shift
- if [ -z "$1" ]; then
- printUsage
- return 1
--
Samba Shared Repository
More information about the samba-cvs
mailing list