Attachment 8432 Details for Bug 9563 – Patch to make the error clearer

[patch] Patch to make the error clearer

0001-samba-tool-domain-classicupgrade-Print-a-better-erro.patch (text/plain), 1.32 KB, created by Andrew Bartlett on 2013-01-15 10:55:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Bartlett

Created: 2013-01-15 10:55:46 UTC

Size: 1.32 KB

patch

obsolete

>From 22bd110897215c8eaf2b89a33e81e3ad2912072b Mon Sep 17 00:00:00 2001
>From: Andrew Bartlett <abartlet@samba.org>
>Date: Tue, 15 Jan 2013 21:53:30 +1100
>Subject: [PATCH] samba-tool domain classicupgrade: Print a better error when
> the ldap backend PW was not found
>
>---
> source4/scripting/python/samba/upgrade.py | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
>index d680a7c..e013d2c 100644
>--- a/source4/scripting/python/samba/upgrade.py
>+++ b/source4/scripting/python/samba/upgrade.py
>@@ -598,7 +598,10 @@ def upgrade_from_samba3(samba3, logger, targetdir, session_info=None,
>     if samba3.lp.get("passdb backend").split(":")[0].strip() == "ldapsam":
>         base_dn =  samba3.lp.get("ldap suffix")
>         ldapuser = samba3.lp.get("ldap admin dn")
>-        ldappass = (secrets_db.get_ldap_bind_pw(ldapuser)).strip('\x00')
>+        ldappass = secrets_db.get_ldap_bind_pw(ldapuser)
>+        if ldappass is None:
>+            raise ProvisioningError("ldapsam passdb backend detected but no LDAP Bind PW found in secrets.tdb for user %s.  Please point this tool at the secrets.tdb that was used by the previous installation.")
>+        ldappass = ldappass.strip('\x00')
>         ldap = True
>     else:
>         ldapuser = None
>-- 
>1.7.11.7
>

Actions: View

Attachments on bug 9563: 8432