X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=contrib%2Fgtk-tool%2FGtk_LdapServer.cc;h=8bb74809890b160762a8b8f6afa205e9efd960b4;hb=9514007d96ff2ab4575106996eb74ef80be7a2e1;hp=ff7c1fc362d1e0437ed9e046800391c0a1ca26a7;hpb=6b854dff20b6b593525ccb4d6b1f029ae4a55e6e;p=openldap

diff --git a/contrib/gtk-tool/Gtk_LdapServer.cc b/contrib/gtk-tool/Gtk_LdapServer.cc
index ff7c1fc362..8bb7480989 100644
--- a/contrib/gtk-tool/Gtk_LdapServer.cc
+++ b/contrib/gtk-tool/Gtk_LdapServer.cc
@@ -32,48 +32,81 @@ void Gtk_LdapServer::setType(int t) {
 	Gtk_Pixmap *xpm_icon;
 	Gtk_Label *label;
 	char *c = NULL;
-	if (this->getchild() != NULL) {
-		xpm_label = new Gtk_HBox(GTK_HBOX(this->getchild()->gtkobj()));
-		xpm_label->remove_c(xpm_label->children()->nth_data(0));
-		xpm_label->remove_c(xpm_label->children()->nth_data(0));
-	}
-	else xpm_label = new Gtk_HBox();
+	if (this->get_child() != NULL) this->remove();
+	xpm_label = new Gtk_HBox();
 	debug(this->hostname);
 	if (strcasecmp(this->hostname,"localhost") == 0)
-		xpm_icon=new Gtk_Pixmap(*xpm_label, local_server);
-	else xpm_icon=new Gtk_Pixmap(*xpm_label, remote_server);
+		xpm_icon=new Gtk_Pixmap(local_server);
+	else xpm_icon=new Gtk_Pixmap(remote_server);
 //	sprintf(c, "%s:%i", this->hostname, this->port);
 //	printf("%s\n", c);
 	label = new Gtk_Label(this->hostname);
 	xpm_label->pack_start(*xpm_icon, false, false, 1);
 	xpm_label->pack_start(*label, false, false, 1);
-	if (this->getchild() == NULL) this->add(xpm_label);
-	label->show();
-	xpm_label->show();
-	xpm_icon->show();
+	if (this->get_child() == NULL) this->add(*xpm_label);
+	this->show_all();
 }
 
 int Gtk_LdapServer::showDetails() {
 	debug("Gtk_LdapServer::showDetails()\n");
+	if (this->notebook == NULL) this->getOptions();
 	if (this->notebook != NULL) {
-//		debug("Have notebook here");
-		if (par->viewport->getchild() != NULL) {
-//			debug(" and viewport has children");
-			par->viewport->remove_c(par->viewport->getchild()->gtkobj());
-//			debug(" which have been removed");
+		debug("Have a notebook here");
+		if (par->viewport2->get_child() != NULL) {
+			debug(" and viewport has children");
+			par->viewport2->remove();
+			debug(" which have been removed\n");
 		}
-//		else debug(" and viewport without children");
-		par->viewport->add(this->notebook);
-		this->notebook->show();
-		par->viewport->show();
-		return 0;
+		else debug(" and viewport without children\n");
+		par->viewport2->add(*this->notebook);
 	}
-	if (this->getOptions() != 0) return 1;
-	this->showDetails();
-//	debug("done\n");
+	this->show_all();
+	debug("done\n");
 	return 0;
 }
 
+int Gtk_LdapServer::getMonitor() {
+	debug("Gtk_LdapServer::getMonitor()\n");
+	int error, entriesCount;
+	LDAPMessage *entry, *result_identifier;
+	BerElement *ber;
+	char *attribute, **t;
+
+	if ((this->ld = ldap_open(this->hostname, this->port)) == NULL) {
+		perror("connection");
+	}
+
+	error = ldap_search_s(this->ld, "cn=monitor", LDAP_SCOPE_BASE, "objectclass=*", NULL, 0, &result_identifier);	
+	entriesCount = ldap_count_entries(this->ld, result_identifier);
+	if (entriesCount == 0) {
+		return 0;
+	}
+
+	debug("%i tree(s)\n", entriesCount);
+	for (entry = ldap_first_entry(this->ld, result_identifier); entry != NULL; entry = ldap_next_entry(this->ld, result_identifier)) {
+		for (attribute = ldap_first_attribute(this->ld, entry, &ber); attribute != NULL; attribute = ldap_next_attribute(this->ld, entry, ber)) {
+			debug("Attrib: %s\n", attribute);
+			if (strcasecmp(attribute, "database") == 0) {
+				debug("have database here\n");
+				this->databases = NULL;
+				t = ldap_get_values(this->ld, entry, attribute);
+				for (int i=0; i<ldap_count_values(t); i++) {
+					this->databases = g_list_append(this->databases, strdup(t[i]));
+				}
+				ldap_value_free(t);
+				debug("databases loaded\n");
+				GList *t;
+				for (int i=0;i>g_list_length(this->databases);i++) {
+					t = g_list_nth(this->databases, i);
+					debug("database(%i) %s\n", i, (char*) t->data);
+				}	
+			}
+		}
+		debug("entry done\n");
+	}
+	return entriesCount;
+}
+
 int Gtk_LdapServer::getConfig() {
 	debug("Gtk_LdapServer::getConfig()\n");
 	int error, entriesCount;
@@ -91,30 +124,35 @@ int Gtk_LdapServer::getConfig() {
 		return 0;
 	}
 
-	debug("%i entry\n", entriesCount);
+//	debug("%i tree(s)\n", entriesCount);
 	for (entry = ldap_first_entry(this->ld, result_identifier); entry != NULL; entry = ldap_next_entry(this->ld, result_identifier)) {
 		for (attribute = ldap_first_attribute(this->ld, entry, &ber); attribute != NULL; attribute = ldap_next_attribute(this->ld, entry, ber)) {
 			debug("Attrib: %s\n", attribute);
 			if (strcasecmp(attribute, "database") == 0) {
 				debug("have database here\n");
-				this->databases = new G_List<char>;
+				this->databases = NULL;
 				t = ldap_get_values(this->ld, entry, attribute);
 				for (int i=0; i<ldap_count_values(t); i++) {
-					this->databases->append(strdup(t[i]));
+					this->databases = g_list_append(this->databases, strdup(t[i]));
 				}
+			this->databases = g_list_append(this->databases, "ldbm : cn=config");
+			this->databases = g_list_append(this->databases, "ldbm : cn=monitor");
+			this->databases = g_list_append(this->databases, "ldbm : cn=schema");
 				ldap_value_free(t);
 				debug("databases loaded\n");
-				for (int i=0; i<this->databases->length(); i++) {
-					debug("database(%i) %s\n", i, this->databases->nth_data(i));
+				GList *t;
+				for (int i=0;i<g_list_length(this->databases);i++) {
+					t = g_list_nth(this->databases, i);
+					debug("database(%i) %s\n", i, (char*) t->data);
 				}	
 			}
 		}
 		debug("entry done\n");
 	}
-//	debug("got %i entries\n", entriesCount);
 	return entriesCount;
 }
 
+#ifndef LDAP_GET_OPT /* a temporary fix for usability with (old) U-MICH api */
 char* Gtk_LdapServer::getOptDescription(int option) {
 	debug("Gtk_LdapServer::getOptDescription(%i) ", option);
 	char *c;
@@ -172,10 +210,21 @@ int Gtk_LdapServer::getOptType(int option) {
 	debug("%i\n", type);
 	return type;
 }
+#endif /* LDAP_GET_OPT */
 
 int Gtk_LdapServer::getOptions() {
 	debug("Gtk_LdapServer::getOptions()\n");
 	if (this->notebook != NULL) return 0;
+#ifdef LDAP_GET_OPT /* a temporary fix for usability with (old) U-MICH api */
+	Gtk_Label *label;
+	label = new Gtk_Label("This tool has been compiled with (old) U-MICH API (no LDAP_GET_OPT)\nCompile with the latest -devel (from OpenLDAP cvs tree)\nto get some nice options here");
+	this->notebook = new Gtk_Frame("LDAP Options");
+	this->notebook->add(*label);
+	//label->show();
+	//this->notebook->show();
+	this->notebook->show_all();
+	return 0;
+#else
 	LDAPAPIInfo api;
 	Gtk_HBox *hbox, *mini_hbox;
 	Gtk_VBox *vbox, *mini_vbox;
@@ -185,7 +234,7 @@ int Gtk_LdapServer::getOptions() {
 	Gtk_HScale *scale;
 	Gtk_Adjustment *adjustment;
 	char *description = NULL, *s_value = NULL;
-	int i_value;
+//	int i_value;
 	string label_string;
 
 	int things[10] = {
@@ -209,14 +258,14 @@ int Gtk_LdapServer::getOptions() {
 		this->getSubtree();
 	} */
 
-//	debug("getting ldap options");
 //	vbox = new Gtk_VBox();
 	table = new Gtk_Table(10, 1, TRUE);
 
 	for (int i=0; i<10; i++) {
+		int i_value;
 	//	debug("%i\n", i);
 		hbox = new Gtk_HBox(TRUE, 2);
-		hbox->border_width(2);
+		hbox->set_border_width(2);
 		description = this->getOptDescription(things[i]);
 		label = new Gtk_Label(description);
 		label->set_justify(GTK_JUSTIFY_LEFT);
@@ -244,29 +293,31 @@ int Gtk_LdapServer::getOptions() {
 				break;
 			case 2:
 				ldap_get_option(this->ld, things[i], &i_value);
-				radio1 = new Gtk_RadioButton(static_cast<GSList*>(0), "Enabled");
-				radio2 = new Gtk_RadioButton(*radio1, "Disabled");
-				if (i_value == 1) radio1->set_state(true);
-				else radio2->set_state(true);
+				radio1 = new Gtk_RadioButton("Enabled");
+				radio2 = new Gtk_RadioButton("Disabled");
+				radio2->set_group(radio1->group());
+				if (i_value == 1) radio1->set_active(true);
+				else radio2->set_active(true);
 				mini_hbox = new Gtk_HBox(FALSE, 2);
-				mini_hbox->border_width(2);
+				mini_hbox->set_border_width(2);
 				mini_hbox->pack_start(*radio1);
-				radio1->show();
+				//radio1->show();
 				mini_hbox->pack_end(*radio2);
-				radio2->show();
+				//radio2->show();
 				hbox->pack_end(*mini_hbox);
-				mini_hbox->show();
+				//mini_hbox->show();
 				break;
 			case 3:
 				ldap_get_option(this->ld, things[i], &i_value);
-				adjustment = new Gtk_Adjustment(i_value, 1.0, 20.0, 1.0, 1.0, 0.0);
+				debug("i_value: %s\n", i_value);
+				adjustment = new Gtk_Adjustment(i_value, 0.0, 20.0, 1.0, 1.0, 0.0);
 				scale = new Gtk_HScale(*adjustment);
 				scale->set_update_policy(GTK_UPDATE_CONTINUOUS);
 				scale->set_value_pos(GTK_POS_TOP);
 				scale->set_digits(0);
 				scale->set_draw_value(true);
 				hbox->pack_end(*scale);
-				scale->show();
+				//scale->show();
 				break;
 			case 4:
 #ifdef LDAP_API_INFO_VERSION
@@ -283,26 +334,28 @@ int Gtk_LdapServer::getOptions() {
 				label->set_justify(GTK_JUSTIFY_LEFT);
 				label->set_alignment(0, 0);
 				hbox->pack_end(*label);
-				label->show();
+				//label->show();
 				break;
 			default:
 				label = new Gtk_Label("Not implemented (yet)");
 				label->set_justify(GTK_JUSTIFY_LEFT);
 				label->set_alignment(0, 0);
 				hbox->pack_end(*label);
-				label->show();
+				//label->show();
 				break;
 		}
 	//	hbox->pack_end(*label);
 	//	label->show();
-		table->attach_defaults(*hbox, 0, 1, i, i+1);
+		table->attach(*hbox, 0, 1, i, i+1);
 		hbox->show();
 	}
-	table->border_width(2);
+	table->set_border_width(2);
 	this->notebook = new Gtk_Frame("LDAP Options");
 	this->notebook->add(*table);
-	table->show();
+	//table->show();
+	this->notebook->show_all();
 	return 0;
+#endif /* LDAP_GET_OPT */
 }
 
 Gtk_Tree* Gtk_LdapServer::getSubtree() {
@@ -317,12 +370,13 @@ Gtk_Tree* Gtk_LdapServer::getSubtree() {
 	char *c;
 	char *tok;
 
-	int len = this->databases->length();
+	int len = g_list_length(this->databases);
 	debug("this->databases->length()=%i\n", len);
 
 	tree = new Gtk_LdapTree();
 	for (int i=0; i<len; i++) {
-		tok = strdup(this->databases->nth_data(i));
+		GList *t = g_list_nth(this->databases, i);
+		tok = strdup((char*)t->data);
 		tok = strtok(tok, ":");
 	//	c = strtok(NULL, " ");
 		c = strtok(NULL, "\0");
@@ -331,42 +385,53 @@ Gtk_Tree* Gtk_LdapServer::getSubtree() {
 		subtree = treeitem->getSubtree(this->ld, 1);
 		debug("inserting %s into %s\n", treeitem->rdn, this->hostname);
 		tree->append(*treeitem);
-		treeitem->set_subtree(*subtree);
+		if (subtree != NULL) treeitem->set_subtree(*subtree);
 		treeitem->show();
+	//	treeitem->setDnd();
 	//	tree->show();
 	}
 //	this->set_subtree(*tree);
-	debug("getTree() done\n");
+	debug("getSubtree() done\n");
 	return tree;
 }
-
+/*
 void Gtk_LdapServer::show_impl() {
 	debug("%s showed\n", this->hostname);
-	Gtk_c_signals_Item *sig=(Gtk_c_signals_Item *)internal_getsignalbase();
-	sig->show(GTK_WIDGET(gtkobj()));
+	BaseClassType *sig=static_cast<BaseClassType *>(get_parent_class());
+	if (!sig->show) return;
+	sig->show(gtkobj());
+//	Gtk_c_signals_Item *sig=(Gtk_c_signals_Item *)internal_getsignalbase();
+//	sig->show(GTK_WIDGET(gtkobj()));
 }
-
+*/
 void Gtk_LdapServer::select_impl() {
 	debug("%s selected\n", this->hostname);
-	Gtk_c_signals_Item *sig=(Gtk_c_signals_Item *)internal_getsignalbase();
-	if (!sig->select) return;
+//	Gtk_c_signals_Item *sig=(Gtk_c_signals_Item *)internal_getsignalbase();
+//	if (!sig->select) return;
 	this->showDetails();
-	sig->select(GTK_ITEM(gtkobj()));
+//	sig->select(GTK_ITEM(gtkobj()));
+	Gtk_TreeItem::select_impl();
 }
 
 void Gtk_LdapServer::collapse_impl() {
 	debug("%s collapsed\n", this->hostname);
-	Gtk_c_signals_TreeItem *sig=(Gtk_c_signals_TreeItem *)internal_getsignalbase();
-	if (!sig->collapse) return;
-	sig->collapse(GTK_TREE_ITEM(gtkobj()));
+//	Gtk_c_signals_TreeItem *sig=(Gtk_c_signals_TreeItem *)internal_getsignalbase();
+//	if (!sig->collapse) return;
+//	sig->collapse(GTK_TREE_ITEM(gtkobj()));
 //	gtk_widget_hide(GTK_WIDGET(GTK_TREE(GTK_TREE_ITEM (this->gtkobj())->subtree)));
+	Gtk_TreeItem::collapse_impl();
 }
 
 void Gtk_LdapServer::expand_impl() {
 	debug("%s expanded\n", this->hostname);
-	Gtk_c_signals_TreeItem *sig=(Gtk_c_signals_TreeItem *)internal_getsignalbase();
-	if (!sig->expand) return;
-	sig->expand(GTK_TREE_ITEM(gtkobj()));
+	Gtk_TreeItem::expand_impl();
+//	BaseClassType *sig=static_cast<BaseClassType *>(get_parent_class());
+//	if (!sig->expand)
+//		{ return; }
+//	sig->expand(gtkobj());
+//	Gtk_c_signals_TreeItem *sig=(Gtk_c_signals_TreeItem *)internal_getsignalbase();
+//	if (!sig->expand) return;
+//	sig->expand(GTK_TREE_ITEM(gtkobj()));
 //	Gtk_Tree *t;
 //	t = new Gtk_Tree(GTK_TREE(GTK_TREE_ITEM(this->gtkobj())->subtree));
 //	bool vis = t->visible();