[Freeipa-devel] [PATCH] 0092 Remove bogus check for smbpasswd

[Alexander Bokovoy]

On Mon, 15 Oct 2012, Rob Crittenden wrote:
>Sumit Bose wrote:
>>On Mon, Oct 15, 2012 at 04:10:45PM +0300, Alexander Bokovoy wrote:
>>>Hi!
>>>
>>>We don't use smbpasswd in adtrustinstance anymore so the check is
>>>bogus.
>>>
>>>One-liner.
>>>
>>>--
>>>/ Alexander Bokovoy
>>
>>ACK
>
>NACK. Please fix the error message too. It should be using the 
>variable smbfile and not file.
Good catch, thanks!

Attached.

-- 
/ Alexander Bokovoy
-------------- next part --------------
>From 00dec00b414cd7d2f5e6d29a3aa59ce795b1c6ac Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy at redhat.com>
Date: Mon, 15 Oct 2012 16:01:26 +0300
Subject: [PATCH] Remove bogus check for smbpasswd

We don't use smbpasswd when configuring IPA for AD trusts anymore
because we switched to use Kerberos authentication in IPA passdb
backend based on CIFS service keytab.
---
 ipaserver/install/adtrustinstance.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ipaserver/install/adtrustinstance.py b/ipaserver/install/adtrustinstance.py
index b74f4b685b1cb56bdcdbae15ab6a8f38960bfc66..b3602ddce7fa1c184bdf1283e67b50463e49c5fd 100644
--- a/ipaserver/install/adtrustinstance.py
+++ b/ipaserver/install/adtrustinstance.py
@@ -60,9 +60,9 @@ and re-run ipa-adtrust-instal again afterwards.
 """
 
 def check_inst():
-    for smbfile in ['/usr/sbin/smbd', '/usr/bin/net', '/usr/bin/smbpasswd']:
+    for smbfile in ['/usr/sbin/smbd', '/usr/bin/net']:
         if not os.path.exists(smbfile):
-            print "%s was not found on this system" % file
+            print "%s was not found on this system" % smbfile
             print "Please install the 'samba' packages and " \
                   "start the installation again"
             return False
-- 
1.7.12