[Cluster-devel] conga/ricci/ricci Ricci.cpp

[Cluster-devel] conga/ricci/ricci Ricci.cpp

[kupcevic]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-06-19 22:41:51

Modified files:
	ricci/ricci    : Ricci.cpp 

Log message:
	ricci: display OS version only if authenticated (not needed for discovery)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/Ricci.cpp.diff?cvsroot=cluster&r1=1.9&r2=1.10

--- conga/ricci/ricci/Ricci.cpp	2006/06/19 21:21:54	1.9
+++ conga/ricci/ricci/Ricci.cpp	2006/06/19 22:41:51	1.10
@@ -73,15 +73,17 @@
     if (name.size())
       header.set_attr("hostname", name);
     
-    string os = os_release();
-    if (os.size())
-      header.set_attr("os", os);
-    
     pair<string, string> c_info = clusterinfo();
     if (c_info.first.size())
       header.set_attr("clustername", c_info.first);
     if (c_info.second.size())
       header.set_attr("clusteralias", c_info.second);
+    
+    if (authed) {
+      string os = os_release();
+      if (os.size())
+	header.set_attr("os", os);
+    }
   }
   
   return header;

[Cluster-devel] conga/ricci/ricci Ricci.cpp

[kupcevic]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-07-12 18:46:08

Modified files:
	ricci/ricci    : Ricci.cpp 

Log message:
	ricci: 'unauthenticate' function should always succeed

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/Ricci.cpp.diff?cvsroot=cluster&r1=1.12&r2=1.13

--- conga/ricci/ricci/Ricci.cpp	2006/07/12 18:27:26	1.12
+++ conga/ricci/ricci/Ricci.cpp	2006/07/12 18:46:08	1.13
@@ -152,13 +152,15 @@
   } else if (function == "unauthenticate") {
     if (!authenticated) {
       // not authenticated
-      success = RRC_NEED_AUTH;
+      //      success = RRC_NEED_AUTH;
+      // unauthenticate should always succeed
+      success = RRC_SUCCESS;
     } else {
       // authenticated
       resp = ricci_header(false);
       success = RRC_SUCCESS;
       remove_cert = true;
-    } // authenticated
+    }
     
   } else if (function == "list_modules") {
     // available modules
@@ -176,7 +178,7 @@
 	resp.add_child(x);
       }
       success = RRC_SUCCESS;
-    } // authenticated
+    }
     
   } else if (function == "process_batch") {
     

[Cluster-devel] conga/ricci/ricci Ricci.cpp

[kupcevic]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-08-14 23:53:21

Modified files:
	ricci/ricci    : Ricci.cpp 

Log message:
	ricci: display clustername in place of clusteralias if alias not set

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/Ricci.cpp.diff?cvsroot=cluster&r1=1.15&r2=1.16

--- conga/ricci/ricci/Ricci.cpp	2006/08/10 22:53:09	1.15
+++ conga/ricci/ricci/Ricci.cpp	2006/08/14 23:53:21	1.16
@@ -494,10 +494,13 @@
     String cluster_conf(buff, length);
     
     XMLObject xml(parseXML(cluster_conf));
-    delete [] buff;
-    buff = 0;
+    delete [] buff; buff = 0;
     
-    return pair<String, String>(xml.get_attr("name"), xml.get_attr("alias"));
+    String name = xml.get_attr("name");
+    String alias = xml.get_attr("alias");
+    if (utils::strip(alias).empty())
+      alias = name;
+    return pair<String, String>(name, alias);
   } catch ( ... ) {
     delete [] buff;
     return pair<String, String>("", "");