fixes #1010 implemented dry run option for IOS

build_num

@@ -1 +1 @@
-#define BUILD_NUM 2260
+#define BUILD_NUM 2261

doc/ChangeLog

@@ -1,5 +1,14 @@
 2009-12-23  vadim  <vadim@vk.crocodile.org>
 
+	* instOptionsDialog.cpp (instOptionsDialog::instOptionsDialog):
+	Added support for the "dry run" installer option for Cisco
+	routers.  When this option is on, installer logs into the router
+	and switches to the enable mode, but does not execute any actual
+	commands. If scp is used to copy configuration to the router,
+	installer will copy the file but will not activate it. This tests
+	ssh session in general, login password, enable password and scp
+	but does not make any changes to the router configuration.
+
 	* OSConfigurator_pix_os.cpp (OSConfigurator_pix_os::_printSSHConfiguration):
 	Implemented pushing of the PIX configuration using scp. This
 	requires PIX v7, ssh v2 and scp should be enabled on the

src/gui/instOptionsDialog.cpp

@@ -152,6 +152,7 @@ instOptionsDialog::instOptionsDialog(QWidget *parent, instConf *_cnf) :
             m_dialog->epwd->hide();
             m_dialog->epwdLbl->hide();
             m_dialog->PIXgroupBox->hide();
+            m_dialog->test->hide();  // dry run option
             // cancelling rollback at the end of activation is currently
             // only supported on pix,fwsm and ios
             m_dialog->cancelRollbackIfSuccess->hide();

src/gui/instoptionsdialog_q.ui

@@ -191,20 +191,13 @@ are never stored permanently)</string>
          <property name="margin" >
           <number>12</number>
          </property>
-         <item row="4" column="0" colspan="2" >
+         <item row="3" column="0" colspan="2" >
           <widget class="QCheckBox" name="saveStandby" >
            <property name="text" >
             <string>Write configuration to standby PIX</string>
            </property>
           </widget>
          </item>
-         <item row="3" column="0" colspan="2" >
-          <widget class="QCheckBox" name="test" >
-           <property name="text" >
-            <string>Dry run (commands won't be executed on the firewall)</string>
-           </property>
-          </widget>
-         </item>
          <item row="2" column="0" colspan="2" >
           <widget class="QCheckBox" name="saveDiff" >
            <property name="text" >
@@ -293,36 +286,43 @@ are never stored permanently)</string>
         <property name="frameShadow" >
          <enum>QFrame::Plain</enum>
         </property>
-        <layout class="QGridLayout" >
+        <layout class="QGridLayout" name="gridLayout_2" >
          <item row="0" column="0" >
+          <widget class="QCheckBox" name="test" >
+           <property name="text" >
+            <string>Dry run (commands won't be executed on the firewall)</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0" >
           <widget class="QCheckBox" name="quiet" >
            <property name="text" >
             <string>Quiet install: do not print anything as commands are executed on the firewall</string>
            </property>
           </widget>
          </item>
-         <item row="1" column="0" >
+         <item row="2" column="0" >
           <widget class="QCheckBox" name="verbose" >
            <property name="text" >
             <string>Verbose: print all commands as they are executed on the firewall</string>
            </property>
           </widget>
          </item>
-         <item row="2" column="0" >
+         <item row="3" column="0" >
           <widget class="QCheckBox" name="stripComments" >
            <property name="text" >
             <string>Remove comments from configuration</string>
            </property>
           </widget>
          </item>
-         <item row="3" column="0" >
+         <item row="4" column="0" >
           <widget class="QCheckBox" name="compressScript" >
            <property name="text" >
             <string>Compress script</string>
            </property>
           </widget>
          </item>
-         <item row="4" column="0" >
+         <item row="5" column="0" >
           <widget class="QCheckBox" name="copyFWB" >
            <property name="text" >
             <string>Store a copy of fwb file on the firewall</string>
@@ -514,7 +514,6 @@ are never stored permanently)</string>
   <tabstop>epwd</tabstop>
   <tabstop>backupConfigFile</tabstop>
   <tabstop>saveDiff</tabstop>
-  <tabstop>test</tabstop>
   <tabstop>saveStandby</tabstop>
   <tabstop>altAddress</tabstop>
   <tabstop>quiet</tabstop>

src/res/help/en_US/release_notes_3.1.0.html

@@ -763,6 +763,16 @@ rule sets of this object rather than in the actual firewalls.
   "reload in ". This hasn't changed since Firewall Builder v3.0
 </p>
 
+<p>
+  Added support for the <b>"dry run"</b> installer option for Cisco
+  routers.  When this option is on, installer logs into the router and
+  switches to the enable mode, but does not execute any actual
+  commands. If scp is used to copy configuration to the router,
+  installer will copy the file but will not activate it. This tests
+  ssh session in general, login password, enable password and scp but
+  does not make any changes to the router configuration.
+</p>
+
 <a name="pix"></a>
 <h2>Changes in support for for Cisco ASA (PIX)</h2>