From f68dd468c8028bca0a05ca314ce79b73fe6ffe08 Mon Sep 17 00:00:00 2001
From: Ana Krivokapic <akrivoka@redhat.com>
Date: Mar 22 2013 14:06:22 +0000
Subject: Use default NETBIOS name in unattended ipa-adtrust-install


Unattended ipa-adtrust-install used to fail if --netbios option
was not provided. This patches fixes this, so that instead of
failing the default NETBIOS name is used.

https://fedorahosted.org/freeipa/ticket/3497

---

diff --git a/install/tools/ipa-adtrust-install b/install/tools/ipa-adtrust-install
index 00b6470..f2b482c 100755
--- a/install/tools/ipa-adtrust-install
+++ b/install/tools/ipa-adtrust-install
@@ -172,7 +172,7 @@ def set_and_check_netbios_name(netbios_name, unattended):
         raise Exception('Unexpected state while checking NetBIOS domain name')
 
     if not adtrustinstance.check_netbios_name(netbios_name):
-        if unattended:
+        if unattended and not gen_netbios_name:
             netbios_name_error(netbios_name)
             sys.exit("Aborting installation.")
         else:
@@ -183,6 +183,9 @@ def set_and_check_netbios_name(netbios_name, unattended):
     if not unattended and not netbios_name:
         netbios_name = read_netbios_name(gen_netbios_name)
 
+    if unattended and not netbios_name and gen_netbios_name:
+        netbios_name = gen_netbios_name
+
     return (netbios_name, reset_netbios_name)
 
 def ensure_admin_kinit(admin_name, admin_password):