Bugzilla BZ#684259: incorrect group used for tps operators

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1895 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

4 files changed, 14 insertions, 7 deletions

diff --git a/pki/base/tps/scripts/addAgents.ldif b/pki/base/tps/scripts/addAgents.ldif
index 840c83f0c..d366bc8a7 100644
--- a/pki/base/tps/scripts/addAgents.ldif
+++ b/pki/base/tps/scripts/addAgents.ldif
@@ -43,7 +43,7 @@ objectClass: top
 objectClass: groupOfNames
 cn: TUS Officers
 member: uid=admin,ou=People,$TOKENDB_ROOT
-description: Operators for TUS
+description: Security Officers for TUS
 
 dn: cn=TUS Administrators,ou=Groups,$TOKENDB_ROOT
 objectClass: top
@@ -51,3 +51,10 @@ objectClass: groupOfNames
 cn: TUS Administrators
 member: uid=admin,ou=People,$TOKENDB_ROOT
 description: Administrators for TUS
+
+dn: cn=TUS Operators,ou=Groups,$TOKENDB_ROOT
+objectClass: top
+objectClass: groupOfNames
+cn: TUS Operators
+member: uid=admin,ou=People,$TOKENDB_ROOT
+description: Operators for TUS
diff --git a/pki/base/tps/src/include/tus/tus_db.h b/pki/base/tps/src/include/tus/tus_db.h
index be5c434be..078b556b0 100644
--- a/pki/base/tps/src/include/tus/tus_db.h
+++ b/pki/base/tps/src/include/tus/tus_db.h
@@ -132,7 +132,7 @@
 #define SUBGROUP_ID         "cn"
 
 /* roles */
-#define OPERATOR            "Officers"
+#define OPERATOR            "Operators"
 #define AGENT               "Agents"
 #define ADMINISTRATOR       "Administrators"
 #define MAX_RETRIES         2
diff --git a/pki/base/tps/src/modules/tokendb/mod_tokendb.cpp b/pki/base/tps/src/modules/tokendb/mod_tokendb.cpp
index 8ec8b3ddb..893591608 100644
--- a/pki/base/tps/src/modules/tokendb/mod_tokendb.cpp
+++ b/pki/base/tps/src/modules/tokendb/mod_tokendb.cpp
@@ -95,7 +95,7 @@ extern TOKENDB_PUBLIC char *nss_var_lookup( apr_pool_t *p, server_rec *s,
 #define BASE64_HEADER "-----BEGIN CERTIFICATE-----\n"
 #define BASE64_FOOTER "-----END CERTIFICATE-----\n"
 
-#define TOKENDB_OPERATORS_IDENTIFIER       "TUS Officers"
+#define TOKENDB_OPERATORS_IDENTIFIER       "TUS Operators"
 #define TOKENDB_AGENTS_IDENTIFIER         "TUS Agents"
 #define TOKENDB_ADMINISTRATORS_IDENTIFIER "TUS Administrators"
 
@@ -6384,7 +6384,7 @@ mod_tokendb_handler( request_rec *rq )
                  e = get_next_entry( e ) ) {
                 char *dn = NULL;
                 dn = get_dn(e);
-                if (PL_strstr(dn, "Officers"))
+                if (PL_strstr(dn, "Operators"))
                     officer=true; 
                 if (PL_strstr(dn, "Agents"))
                     agent = true; 
diff --git a/pki/base/tps/src/tus/tus_db.c b/pki/base/tps/src/tus/tus_db.c
index abcf0cf5a..286a7edf5 100644
--- a/pki/base/tps/src/tus/tus_db.c
+++ b/pki/base/tps/src/tus/tus_db.c
@@ -712,7 +712,7 @@ TPS_PUBLIC char *tus_authenticate(char *cert)
 /*********
  * tus_authorize
  * parameters passed in: 
- *   char * group ("TUS Agents", "TUS Officers", "TUS Administrators") 
+ *   char * group ("TUS Agents", "TUS Operators", "TUS Administrators") 
  *   const char* userid
  * returns : 1 if userid is member of that group
  *           0 otherwise
@@ -2336,7 +2336,7 @@ TPS_PUBLIC int add_user_db_entry(const char *agentid, char *userid, char *userPa
  * summary: adds user to be member of group (administrators, agents, operators)
  * params: agentid -user who is performing this change
  *       : userid - userid of user to be added to role
- *       : role - Officers, Agents or Administrators
+ *       : role - Operators, Agents or Administrators
  * returns: LDAP return code
  */
 TPS_PUBLIC int add_user_to_role_db_entry(const char *agentid, char *userid, const char *role) {
@@ -2377,7 +2377,7 @@ TPS_PUBLIC int add_user_to_role_db_entry(const char *agentid, char *userid, cons
  * summary: removes user from role group (administrators, agents, operators)
  * params: agentid -user who is performing this change
  *       : userid - userid of user to be removed from role
- *       : role - Officers, Agents or Administrators
+ *       : role - Operators, Agents or Administrators
  *  returns: LDAP return code
  */
 TPS_PUBLIC int delete_user_from_role_db_entry(const char *agentid, char *userid, const char *role) {