secure_io toggles security (on defaultly) and --no_sec doesnt do

anything anymore

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1194 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/branches/aleung/security1/ceph/config.cc b/branches/aleung/security1/ceph/config.cc
index c0a894ad178f9dd416a96e65655ca956c9bb6fc6..e768439687f532dd940f9389d7fb7a26c1d1059c 100644 (file)
--- a/branches/aleung/security1/ceph/config.cc
+++ b/branches/aleung/security1/ceph/config.cc
@@ -302,7 +302,7 @@ md_config_t g_conf = {
   fakeclient_op_close:    200,
 
   //security (all principals)
-  secure_io:              true,
+  secure_io:              1, /* 0=off, 1=on */
   mds_group:              0, /* 0=none, 1=unix, 2=batch, 3=def, 4=predict */
   mds_collection:         0, /* 0=none, 1=unix, 3=def */
   unix_group_file:       0,
@@ -777,8 +777,10 @@ void parse_config_options(std::vector<char*>& args)
       g_conf.tick = atoi(args[++i]);
 
     // security flag to turn off security
-    else if (strcmp(args[i], "--no_sec") == 0)
-      g_conf.secure_io = false;
+    //else if (strcmp(args[i], "--no_sec") == 0)
+    else if(strcmp(args[i], "--secure_io") == 0)
+      g_conf.secure_io = atoi(args[++i]);
+      //g_conf.secure_io = false;
     else if (strcmp(args[i], "--mds_group") == 0)
       g_conf.mds_group = atoi(args[++i]);
     else if (strcmp(args[i], "--mds_collection") == 0)

diff --git a/branches/aleung/security1/ceph/config.h b/branches/aleung/security1/ceph/config.h
index baf071d81b89878e3b0c8c3045d31184b62abd79..e17998180bab993a8d4361fae38f5381848f89df 100644 (file)
--- a/branches/aleung/security1/ceph/config.h
+++ b/branches/aleung/security1/ceph/config.h
@@ -291,7 +291,8 @@ struct md_config_t {
   int fakeclient_op_close;
 
   // security (all princiapls)
-  bool secure_io;
+  //bool secure_io;
+  int secure_io;
   int mds_group;
   int mds_collection;
   char *unix_group_file;