The branch, master has been updated
via d6e801b7d9a666d40f109df20dff0faaa2b46e70 (commit)
via 9fa6fb3d9fb2e4cee81ad34d6fd0cbe6f5265171 (commit)
via b4551bba07017c852d64524e3324223b9b0f05c9 (commit)
via b7cafb98429f45e2aad10e683618da4626da5c84 (commit)
from fe9dd8710d577478b324d1d507de0ecd77df2ea5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d6e801b7d9a666d40f109df20dff0faaa2b46e70
Merge: 9fa6fb3d9fb2e4cee81ad34d6fd0cbe6f5265171
fe9dd8710d577478b324d1d507de0ecd77df2ea5
Author: Andrew Bartlett <[email protected]>
Date: Mon Jan 19 13:39:54 2009 +1100
Merge branch 'master' of ssh://git.samba.org/data/git/samba into
abartlet-devel
commit 9fa6fb3d9fb2e4cee81ad34d6fd0cbe6f5265171
Author: Andrew Bartlett <[email protected]>
Date: Mon Jan 19 12:15:47 2009 +1100
Print more useful suggestion for the main provision command line
commit b4551bba07017c852d64524e3324223b9b0f05c9
Author: Andrew Bartlett <[email protected]>
Date: Wed Jan 14 20:32:18 2009 +1100
Delete more Samba3-specific files
commit b7cafb98429f45e2aad10e683618da4626da5c84
Author: Andrew Bartlett <[email protected]>
Date: Wed Jan 14 20:31:58 2009 +1100
Don't give fatal python errors when guessing the realm
-----------------------------------------------------------------------
Summary of changes:
source4/script/mkrelease.sh | 2 +-
source4/scripting/python/samba/provision.py | 2 +-
source4/setup/provision | 14 ++++++++++++--
3 files changed, 14 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/script/mkrelease.sh b/source4/script/mkrelease.sh
index 110988d..94bd9d2 100755
--- a/source4/script/mkrelease.sh
+++ b/source4/script/mkrelease.sh
@@ -12,7 +12,7 @@ TMPDIR=`mktemp -d samba-XXXXX`
#Prepare the tarball for a Samba4 release, with some generated files,
#but without Samba3 stuff (to avoid confusion)
( cd $TMPDIR/ || exit 1
- rm -rf source3 packaging docs-xml examples swat WHATSNEW.txt MAINTAINERS ||
exit 1
+ rm -rf README Manifest Read-Manifest-Now Roadmap source3 packaging docs-xml
examples swat WHATSNEW.txt MAINTAINERS || exit 1
cd source4 || exit 1
./autogen.sh || exit 1
./configure || exit 1
diff --git a/source4/scripting/python/samba/provision.py
b/source4/scripting/python/samba/provision.py
index 70bd8ac..2da54ef 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1405,7 +1405,7 @@ def provision_backend(setup_dir=None, message=None,
message("LDAP admin password: %s" % adminpass)
message(slapdcommand)
- message("Run provision with: --ldap-backend=ldapi --ldap-backend-type=" +
ldap_backend_type + " --password=" + adminpass + " " + ldapuser)
+ message("Run provision with: --ldap-backend=ldapi --ldap-backend-type=" +
ldap_backend_type + " --password=" + adminpass + " " + ldapuser + "--realm=" +
names.dnsdomain + " --domain=" + names.domain + " --server-role='" + serverrole
+ "'")
def create_phpldapadmin_config(path, setup_path, ldapi_uri):
"""Create a PHP LDAP admin configuration file.
diff --git a/source4/setup/provision b/source4/setup/provision
index 55a438c..55535cf 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -129,8 +129,18 @@ if opts.interactive:
else:
print "%s: " % (prompt,),
return sys.stdin.readline().rstrip("\n") or default
- opts.realm = ask("Realm", socket.getfqdn().split(".", 1)[1].upper())
- opts.domain = ask("Domain", opts.realm.split(".")[0])
+ try:
+ opts.realm = ask("Realm", socket.getfqdn().split(".",
1)[1].upper())
+ except IndexError:
+ print >>sys.stderr, "Cannot guess realm from %s" % (
socket.getfqdn())
+ sys.exit(1)
+
+ try:
+ opts.domain = ask("Domain", opts.realm.split(".")[0])
+ except IndexError:
+ print >>sys.stderr, "Cannot guess domain from %s" % (
opts.realm())
+ sys.exit(1)
+
opts.server_role = ask("Server Role (dc, member, standalone)", "dc")
for i in range(3):
opts.adminpass = getpass("Administrator password: ")
--
Samba Shared Repository
