[SCM] Samba Shared Repository - branch master updated
Michael Adam
obnox at samba.org
Thu Feb 16 05:48:02 MST 2012
The branch, master has been updated
via a389632 wafsamba: exclude '.brzignore' from "make dist"
via e0797c6 wafsamba: exclude '.gitignore' from "make dist"
via 5674724 wafsamba: fix blacklist handling in "make dist"
via 8ca39df s4:provision: only print the adminpass if it was generated (not user-provided)
via 09b865b s4:provision: generate the adminpass provision() instead of provision_fill()
via 32cf164 s4:provision: don't log the ldap admin password - it is internal only
via ea27879 s4-scripting: samba-tool: Fix domain info usage message
via 83d0a86 s4-selftest: fix output of opened connections in torture_holdcon
from b5b2041 Rename obscure defined constants.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a389632e1c2cf809aae02659c203687b6f5654ff
Author: Michael Adam <obnox at samba.org>
Date: Thu Feb 16 12:08:30 2012 +0100
wafsamba: exclude '.brzignore' from "make dist"
.bzrignore can cause unwanted effects, if one e.g. maintains
a packaging (like debian) of the generated distribution in bzr.
Autobuild-User: Michael Adam <obnox at samba.org>
Autobuild-Date: Thu Feb 16 13:47:52 CET 2012 on sn-devel-104
commit e0797c6c9a41dcf1f7d8c6c20b1a5a8b18c70ba6
Author: Michael Adam <obnox at samba.org>
Date: Wed Feb 15 15:34:58 2012 +0100
wafsamba: exclude '.gitignore' from "make dist"
.gitignore can cause unwanted effects, if one e.g. maintains
a packaging (like debian) of the generated distribution in git
commit 56747249ca33433e10f4e5839bdf739055e26155
Author: Michael Adam <obnox at samba.org>
Date: Wed Feb 15 16:07:54 2012 +0100
wafsamba: fix blacklist handling in "make dist"
commit 8ca39dfbe18557969e543da5fa9ef0e3c2fd0aa9
Author: Michael Adam <obnox at samba.org>
Date: Thu Feb 16 12:06:34 2012 +0100
s4:provision: only print the adminpass if it was generated (not user-provided)
commit 09b865b2f00fceef62af1228552fedd08cfee461
Author: Michael Adam <obnox at samba.org>
Date: Thu Feb 16 11:21:30 2012 +0100
s4:provision: generate the adminpass provision() instead of provision_fill()
so that the adminpass can be logged at the end
(otherwise we get "None")
commit 32cf164d999624dce752aac319a3316f268cb931
Author: Michael Adam <obnox at samba.org>
Date: Thu Feb 16 00:51:54 2012 +0100
s4:provision: don't log the ldap admin password - it is internal only
commit ea27879dd0d1a1eb6c5a7f7fef2cc69418ab691b
Author: Björn Baumbach <bb at sernet.de>
Date: Tue Jan 24 13:02:13 2012 +0100
s4-scripting: samba-tool: Fix domain info usage message
Signed-off-by: Michael Adam <obnox at samba.org>
commit 83d0a860a1e881aee3679bc504756e7ae6879d7b
Author: Björn Baumbach <bb at sernet.de>
Date: Tue Jan 10 16:43:27 2012 +0100
s4-selftest: fix output of opened connections in torture_holdcon
Signed-off-by: Michael Adam <obnox at samba.org>
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_dist.py | 2 +-
source4/scripting/python/samba/netcmd/domain.py | 2 +-
.../scripting/python/samba/provision/__init__.py | 14 ++++++++------
source4/torture/basic/misc.c | 2 +-
wscript | 1 +
5 files changed, 12 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_dist.py b/buildtools/wafsamba/samba_dist.py
index a11a37c..79cb721 100644
--- a/buildtools/wafsamba/samba_dist.py
+++ b/buildtools/wafsamba/samba_dist.py
@@ -141,7 +141,7 @@ def dist(appname='',version=''):
f = f[len(dir)+1:]
# Remove files in the blacklist
- if f in dist_blacklist:
+ if f in blacklist:
continue
blacklisted = False
# Remove directories in the blacklist
diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py
index b0c174b..992698d 100644
--- a/source4/scripting/python/samba/netcmd/domain.py
+++ b/source4/scripting/python/samba/netcmd/domain.py
@@ -97,7 +97,7 @@ class cmd_domain_export_keytab(Command):
class cmd_domain_info(Command):
"""Print basic info about a domain and the DC passed as parameter"""
- synopsis = "%prog domain info <ip_address> [options]"
+ synopsis = "%prog <ip_address> [options]"
takes_options = [
]
diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index 295e272..25a4551 100644
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -1436,8 +1436,6 @@ def provision_fill(samdb, secrets_ldb, logger, names, paths,
if invocationid is None:
invocationid = str(uuid.uuid4())
- if adminpass is None:
- adminpass = samba.generate_random_password(12, 32)
if krbtgtpass is None:
krbtgtpass = samba.generate_random_password(128, 255)
if machinepass is None:
@@ -1744,6 +1742,12 @@ def provision(logger, session_info, credentials, smbconf=None,
if not os.path.isdir(paths.netlogon):
os.makedirs(paths.netlogon, 0755)
+ if adminpass is None:
+ adminpass = samba.generate_random_password(12, 32)
+ adminpass_generated = True
+ else:
+ adminpass_generated = False
+
if samdb_fill == FILL_FULL:
provision_fill(samdb, secrets_ldb, logger,
names, paths, schema=schema, targetdir=targetdir,
@@ -1798,7 +1802,8 @@ def provision(logger, session_info, credentials, smbconf=None,
logger.info("DNS Domain: %s" % names.dnsdomain)
logger.info("DOMAIN SID: %s" % str(domainsid))
if samdb_fill == FILL_FULL:
- logger.info("Admin password: %s" % adminpass)
+ if adminpass_generated:
+ logger.info("Admin password: %s" % adminpass)
if provision_backend.type is not "ldb":
if provision_backend.credentials.get_bind_dn() is not None:
logger.info("LDAP Backend Admin DN: %s" %
@@ -1807,9 +1812,6 @@ def provision(logger, session_info, credentials, smbconf=None,
logger.info("LDAP Admin User: %s" %
provision_backend.credentials.get_username())
- logger.info("LDAP Admin Password: %s" %
- provision_backend.credentials.get_password())
-
if provision_backend.slapd_command_escaped is not None:
# now display slapd_command_file.txt to show how slapd must be
# started next time
diff --git a/source4/torture/basic/misc.c b/source4/torture/basic/misc.c
index 0515988..213d923 100644
--- a/source4/torture/basic/misc.c
+++ b/source4/torture/basic/misc.c
@@ -198,7 +198,7 @@ bool torture_holdcon(struct torture_context *tctx)
return false;
}
if (torture_setting_bool(tctx, "progress", true)) {
- torture_comment(tctx, "opened %d connections\r", i);
+ torture_comment(tctx, "opened %d connections\r", i+1);
fflush(stdout);
}
}
diff --git a/wscript b/wscript
index 9db278c..5901f5a 100755
--- a/wscript
+++ b/wscript
@@ -12,6 +12,7 @@ import wafsamba, Options, samba_dist, Scripting, Utils, samba_version
samba_dist.DIST_DIRS('.')
+samba_dist.DIST_BLACKLIST('.gitignore .bzrignore')
# install in /usr/local/samba by default
Options.default_prefix = '/usr/local/samba'
--
Samba Shared Repository
More information about the samba-cvs
mailing list