From 73e2686fdc6e3f7c5805a4d88ed5f81094fe548b Mon Sep 17 00:00:00 2001 From: anwleung Date: Fri, 9 Mar 2007 23:43:25 +0000 Subject: [PATCH] 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 --- branches/aleung/security1/ceph/config.cc | 8 +++++--- branches/aleung/security1/ceph/config.h | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/branches/aleung/security1/ceph/config.cc b/branches/aleung/security1/ceph/config.cc index c0a894ad178f9..e768439687f53 100644 --- 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& 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 baf071d81b898..e17998180bab9 100644 --- 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; -- 2.39.5