[ViewVC] Diff of: cvs/gvpe/src/vped.C

Comparing gvpe/src/vped.C (file contents):
Revision 1.1 by pcg, Sat Mar 1 15:53:03 2003 UTC vs.
Revision 1.2 by pcg, Thu Mar 6 18:43:07 2003 UTC

 #include "util.h"
 #include "protocol.h"
 vpn network;
+static loglevel llevel = L_NONE;
 /* If nonzero, display usage information and exit. */
 static int show_help;
 /* If nonzero, print the version on standard output and exit.  */
 static int show_version;
           break;
 #endif
         case 'l':		/* inc debug level */
           {
-            loglevel l = string_to_loglevel (optarg);
+            llevel = string_to_loglevel (optarg);
-            if (l != L_NONE)
+            if (llevel == L_NONE)
-              set_loglevel (l);
-            else
               slog (L_WARN, "'%s': %s", optarg, UNKNOWN_LOGLEVEL);
           }
           break;
         case '?':
 #endif
   make_names ();
   conf.read_config (true);
+  set_loglevel (llevel != L_NONE ? llevel : conf.llevel);
   RAND_load_file ("/dev/urandom", 1024);
-  //OpenSSL_add_all_algorithms ();
+  if (!thisnode)
-  if (!THISNODE)
     {
       slog (L_ERR, _("current node not set, or node '%s' not found in configfile, use the -n switch when starting vped."),
             thisnode ? thisnode : "<unset>");
       exit (1);
     }

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines