1989. [bug] win32: don't check the service password when

                        re-installing. [RT #15882]

diff --git a/CHANGES b/CHANGES
index 44340aa9b633e73cbc87116d5e20648d99ebdf3b..b8c9f28c59c02af522be9270b98e82c382b89ffd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1989.  [bug]           win32: don't check the service password when
+                       re-installing. [RT #15882]
+
 1985.  [protocol]      DLV has now been assigned a official type code of
                        32769. [RT #15807]
 

diff --git a/bin/win32/BINDInstall/BINDInstallDlg.cpp b/bin/win32/BINDInstall/BINDInstallDlg.cpp
index 511ab6e86a0e25e81db026158f3f86e98f5cf250..428bdc15d76ee2b95ecfce617990e353b4848799 100644 (file)
--- a/bin/win32/BINDInstall/BINDInstallDlg.cpp
+++ b/bin/win32/BINDInstall/BINDInstallDlg.cpp
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: BINDInstallDlg.cpp,v 1.6.2.6.2.12 2005/10/11 23:54:48 marka Exp $ */
+/* $Id: BINDInstallDlg.cpp,v 1.6.2.6.2.13 2006/02/24 03:53:20 marka Exp $ */
 
 /*
  * Copyright (c) 1999-2000 by Nortel Networks Corporation
@@ -415,27 +415,29 @@ void CBINDInstallDlg::OnInstall() {
                return;
        }
        
-       /*
-        * Check that the Password is not null.
-        */
-       if (m_accountPassword.GetLength() == 0) {
-               MsgBox(IDS_ERR_NULLPASSWORD);
-               return;
-       }
-
        /*
         * Check the entered account name.
         */
        if (ValidateServiceAccount() == FALSE)
                return;
 
-
        /*
         * For Registration we need to know if account was changed.
         */
-       if(m_accountName != m_currentAccount)
+       if (m_accountName != m_currentAccount)
                m_accountUsed = FALSE;
 
+       if (m_accountUsed == FALSE && m_serviceExists == FALSE)
+       {
+       /*
+        * Check that the Password is not null.
+        */
+               if (m_accountPassword.GetLength() == 0) {
+                       MsgBox(IDS_ERR_NULLPASSWORD);
+                       return;
+               }
+       }
+
        /* Directories */
        m_etcDir = m_targetDir + "\\etc";
        m_binDir = m_targetDir + "\\bin";