"kill quart of draksec code" patch aka make it really working aka "happy fred" :

- security::msec :
  o consolidate get_function_value() and get_value into get_value()
  o really apply changes, aka save them :
    * config_check() : use substInFile and setVarsInSh
    * config_function() : use substInFile and append_to_file
    * kill stupid and bogus config_option()
  o don't overwrite previous changes, aka reread them :
    * fix checks and functions current value loading
    * fix checks and functions default loading

- security::main :
  o simplify ui creation, make it more readable
  o kill offuscating basic_secadmin_check(), basic_secadmin_entry(),
    network_generate_page(), system_generate_page() and checks_generate_page()
  o increase default height because of stupid "add_with_viewport" in
    ugtk::createScrolledWindow
  o consolidate network and system functions managment, they're all the same for
    msec, splitting is only a draksec "feature";  all go in %options_values

- draksec :
  o let standalone module configure standalone mode
  o security::main already take care of initializing gtk
  o security::main already take care of exiting
  o don't play with embedded mode special variables

it overall looks better but big cleanups're still possible for mdk9.1

1 files changed, 3 insertions, 8 deletions

diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec
index 084ae3f42..fe2794b52 100755
--- a/perl-install/standalone/draksec
+++ b/perl-install/standalone/draksec
@@ -26,9 +26,9 @@
 		     };
 
 use lib qw(/usr/lib/libDrakX);
-
+use standalone;
 use strict;
-use vars qw($MODE %options $XID $CCPID);
+use vars qw($MODE %options);
 
 use security::main;
 
@@ -38,9 +38,4 @@ $0 =~ '/draksec-perms$' and $MODE = 'perms';
 
 /^-?-(\S+)$/ and $options{$1} = 1 foreach @ARGV;
 
-$::isStandalone = 1;
-Gtk->init;
-
-draksec_main();
-
-myexit 0;
+security::main::draksec_main();