diff -urN gnome-system-tools-2.14.0.orig/src/users/Makefile.am gnome-system-tools-2.14.0/src/users/Makefile.am

--- gnome-system-tools-2.14.0.orig/src/users/Makefile.am	2008-08-20 09:37:14.200348000 +0800

+++ gnome-system-tools-2.14.0/src/users/Makefile.am	2008-08-22 07:19:34.724969000 +0800

@@ -32,6 +32,7 @@

 	user-group-xml.c user-group-xml.h \

 	profiles-table.c profiles-table.h \

 	profile-settings.c profile-settings.h \

-	privileges-table.c privileges-table.h

+	privileges-table.c privileges-table.h \

+	roles-table.c roles-table.h

 toolpixmaps =

diff -urN gnome-system-tools-2.14.0.orig/src/users/callbacks.c gnome-system-tools-2.14.0/src/users/callbacks.c

--- gnome-system-tools-2.14.0.orig/src/users/callbacks.c	2008-08-20 09:37:14.203441000 +0800

+++ gnome-system-tools-2.14.0/src/users/callbacks.c	2008-08-20 09:39:07.030442000 +0800

@@ -641,7 +641,11 @@

 	combo_add_shells (shells_combo);

 	combo_add_groups (groups_option_menu, TRUE);

 	profile_settings_set_data (node);

+#ifndef __sun

 	populate_privileges_table_from_profile (privileges, node);

+#else

+	populate_privileges_table(privileges, node);

+#endif

 	g_object_set_data (G_OBJECT (dialog), "data", node);

diff -urN gnome-system-tools-2.14.0.orig/src/users/group-settings.c gnome-system-tools-2.14.0/src/users/group-settings.c

--- gnome-system-tools-2.14.0.orig/src/users/group-settings.c	2008-08-20 09:37:14.205458000 +0800

+++ gnome-system-tools-2.14.0/src/users/group-settings.c	2008-08-20 09:39:07.023541000 +0800

@@ -79,6 +79,7 @@

 	GtkWidget *group_settings_all = gst_dialog_get_widget (tool->main_dialog, "group_settings_all");

 	GtkWidget *group_settings_members = gst_dialog_get_widget (tool->main_dialog, "group_settings_members");

 	GtkWidget *widget;

+	GtkSpinButton *spin_button;

 	gchar     *buf;

 	GList *group_settings_all_list = NULL;

@@ -90,11 +91,12 @@

 	widget = gst_dialog_get_widget (tool->main_dialog, "group_settings_dialog");

 	gtk_window_set_title (GTK_WINDOW (widget), _("Create New Group"));

+	spin_button = GTK_SPIN_BUTTON (gst_dialog_get_widget (tool->main_dialog, "group_settings_gid"));

+	gtk_spin_button_set_range (spin_button, 0, IDMAX);

 	/* Fill in first available gid */

 	buf = (gchar *) find_new_id (gd->node, NULL);

 	if (buf) {

-		gtk_spin_button_set_value (GTK_SPIN_BUTTON (gst_dialog_get_widget (tool->main_dialog, "group_settings_gid")), 

-		                           g_strtod (buf, NULL));

+		gtk_spin_button_set_value (spin_button, g_strtod (buf, NULL));

 		g_free (buf);

 	}

@@ -357,6 +359,7 @@

 	txt = gst_xml_get_child_content (gd->node, "gid");

 	w0 = gst_dialog_get_widget (tool->main_dialog, "group_settings_gid");

 	gtk_widget_set_sensitive (w0, gst_tool_get_access (tool));

+	gtk_spin_button_set_range (GTK_SPIN_BUTTON (w0), 0, IDMAX);

 	gtk_spin_button_set_value (GTK_SPIN_BUTTON (w0), g_strtod (txt, NULL));

 	/* Show group settings dialog */

diff -urN gnome-system-tools-2.14.0.orig/src/users/passwd.c gnome-system-tools-2.14.0/src/users/passwd.c

--- gnome-system-tools-2.14.0.orig/src/users/passwd.c	2008-08-20 09:37:14.206361000 +0800

+++ gnome-system-tools-2.14.0/src/users/passwd.c	2008-08-20 09:39:07.029785000 +0800

@@ -191,10 +191,14 @@

 	else

 		password = g_strdup (pwd);

+#ifdef USE_AUTHEN_PAM

+	buf = g_strdup(password);

+#else

 	if (uses_md5 ()) 

 		buf = g_strdup (crypt_md5 (password, rand_str (salt, 8)));

 	else

 		buf = g_strdup (crypt (password, rand_str (salt, 2)));

+#endif

 	gst_xml_set_child_content (node, "password", buf);

diff -urN gnome-system-tools-2.14.0.orig/src/users/privileges-table.c gnome-system-tools-2.14.0/src/users/privileges-table.c

--- gnome-system-tools-2.14.0.orig/src/users/privileges-table.c	2008-08-20 09:37:14.222946000 +0800

+++ gnome-system-tools-2.14.0/src/users/privileges-table.c	2008-08-20 09:39:07.031073000 +0800

@@ -97,6 +97,7 @@

 	create_privileges_table (list);

 }

+#ifndef __sun

 void

 populate_privileges_table (GtkWidget *list, gchar *username)

 {

@@ -271,3 +272,152 @@

 		valid = gtk_tree_model_iter_next (model, &iter);

 	}

 }

+#else /* __sun */

+static gboolean

+user_has_rbac_profile( xmlNodePtr user_node, gchar *profile_name ) 

+{

+    xmlNodePtr  user_rbac, assigned_profiles, profile;

+    gchar       *buf;

+    gboolean    rval = FALSE;

+

+    user_rbac = gst_xml_element_find_first (user_node, "rbac");

+

+    /* It's possible that the profile has no entries */

+    if (user_rbac == NULL)

+        return(FALSE);

+

+    assigned_profiles = gst_xml_element_find_first (user_rbac, "rbac_profiles");

+    g_return_val_if_fail( assigned_profiles != NULL, FALSE );

+

+    for (profile = gst_xml_element_find_first (assigned_profiles, "rbac_profile");

+         profile != NULL;

+         profile = gst_xml_element_find_next (profile, "rbac_profile")) {

+            buf = gst_xml_element_get_content (profile);

+

+            if (strcmp (profile_name, buf) == 0) {

+                g_free (buf);

+                rval = TRUE;

+                break;

+            }

+

+            g_free (buf);

+    }

+

+    return rval;

+}

+

+void

+populate_privileges_table (GtkWidget *list, xmlNodePtr user_node)

+{

+	GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (list));

+	xmlNodePtr    rbacdb_root = get_root_node (NODE_RBAC);

+	xmlNodePtr    profiles, profile, user;

+	GtkTreeIter   iter;

+	gchar        *name, *desc, *buf;

+	gboolean      val;

+

+	gtk_list_store_clear (GTK_LIST_STORE (model));

+

+	profiles = gst_xml_element_find_first (rbacdb_root, "rbac_profiles");

+	for (profile = gst_xml_element_find_first (profiles, "rbac_profile");

+	     profile != NULL;

+	     profile = gst_xml_element_find_next (profile, "rbac_profile")) {

+		name = gst_xml_get_child_content (profile, "name");

+		desc = gst_xml_get_child_content (profile, "description");

+

+		if (name) {

+                        gchar *combined_str;

+

+			val = FALSE;

+

+			/* check whether the user already has RBAC profile */

+                        if (user_node ) {

+                            if ( user_has_rbac_profile( user_node, name )) {

+                                val = TRUE;

+                            }

+                        }

+

+                        if ( desc != NULL ) {

+                            combined_str = g_strdup_printf("%s (%s)", name, desc );

+                        }

+                        else {

+                            combined_str = name;

+                        }

+			

+			gtk_list_store_append (GTK_LIST_STORE (model), &iter);

+			gtk_list_store_set (GTK_LIST_STORE (model), &iter,

+					    0, val,

+					    1, combined_str,

+					    2, name,

+					    -1);

+                        if ( desc != NULL && combined_str != name ) 

+                            g_free( combined_str );

+			g_free (desc);

+			g_free (name);

+		}

+	}

+}

+

+static void

+privileges_save_data (xmlNodePtr profile, const gchar* widget_name )

+{

+        

+	GtkWidget    *list  = NULL;

+	GtkTreeModel *model = NULL;

+	GtkTreeIter   iter;

+	xmlNodePtr    rbac_node, rbac_profiles_node, rbac_profile_node;

+	gboolean      valid, active;

+	gchar        *name;

+

+	g_return_if_fail (profile != NULL);

+	g_return_if_fail (widget_name != NULL);

+

+	list  = gst_dialog_get_widget (tool->main_dialog, widget_name);

+	model = gtk_tree_view_get_model (GTK_TREE_VIEW (list));

+	rbac_node = gst_xml_element_find_first (profile, "rbac");

+        

+        if ( rbac_node != NULL ) {

+	    rbac_profiles_node = gst_xml_element_find_first (rbac_node, "rbac_profiles");

+            if (rbac_profiles_node) {

+                gst_xml_element_destroy_children (rbac_profiles_node);

+            }

+            else {

+                rbac_profiles_node = gst_xml_element_add (profile, "rbac_profiles");

+            }

+        }

+        else {

+            rbac_node =  gst_xml_element_add (profile, "rbac");

+            rbac_profiles_node = gst_xml_element_add (rbac_node, "rbac_profiles");

+        }

+

+	valid = gtk_tree_model_get_iter_first (model, &iter);

+

+	while (valid) {

+		gtk_tree_model_get (model, &iter,

+				    0, &active,

+				    2, &name,

+				    -1);

+

+		if (active) {

+			rbac_profile_node = gst_xml_element_add (rbac_profiles_node, "rbac_profile");

+			gst_xml_element_set_content (rbac_profile_node, name);

+		}

+

+		g_free (name);

+		valid = gtk_tree_model_iter_next (model, &iter);

+	}

+}

+

+void

+user_privileges_save_data (xmlNodePtr node)

+{

+    privileges_save_data( node, "user_privileges");

+}

+

+void

+profile_privileges_save_data (xmlNodePtr node)

+{

+    privileges_save_data( node, "profile_privileges");

+}

+

+#endif /* __sun */

diff -urN gnome-system-tools-2.14.0.orig/src/users/privileges-table.h gnome-system-tools-2.14.0/src/users/privileges-table.h

--- gnome-system-tools-2.14.0.orig/src/users/privileges-table.h	2008-08-20 09:37:14.223386000 +0800

+++ gnome-system-tools-2.14.0/src/users/privileges-table.h	2008-08-20 09:39:07.031423000 +0800

@@ -27,7 +27,13 @@

 void     create_user_privileges_table      (void);

 void     create_profile_privileges_table   (void);

+#ifndef __sun

 void     populate_privileges_table         (GtkWidget*, gchar*);

+void     user_privileges_save_data         (xmlNodePtr);

+void     profile_privileges_save_data      (xmlNodePtr);

+#else

+void     populate_privileges_table          (GtkWidget *list, xmlNodePtr user_node);

+#endif

 void     populate_privileges_table_from_profile (GtkWidget*, xmlNodePtr);

 GList*   user_privileges_get_list          (GList*);

diff -urN gnome-system-tools-2.14.0.orig/src/users/profile-settings.c gnome-system-tools-2.14.0/src/users/profile-settings.c

--- gnome-system-tools-2.14.0.orig/src/users/profile-settings.c	2008-08-20 09:37:14.222032000 +0800

+++ gnome-system-tools-2.14.0/src/users/profile-settings.c	2008-08-20 09:39:07.033086000 +0800

@@ -110,7 +110,11 @@

 	gst_xml_element_add_with_content (node, "mailbox_dir", "/var/mail");

 	gst_xml_element_add_with_content (node, "skel_dir",    "/etc/skel/");

 	gst_xml_element_add_with_content (node, "login_defs",  "1");

+#ifndef __sun

 	profile_groups_save_data (node);

+#else

+	profile_privileges_save_data (node);

+#endif

 }

 gchar*

diff -urN gnome-system-tools-2.14.0.orig/src/users/roles-table.c gnome-system-tools-2.14.0/src/users/roles-table.c

--- gnome-system-tools-2.14.0.orig/src/users/roles-table.c	1970-01-01 08:00:00.000000000 +0800

+++ gnome-system-tools-2.14.0/src/users/roles-table.c	2008-09-04 06:47:02.898745000 +0800

@@ -0,0 +1,217 @@

+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */

+/* roles-table.c: this file is part of users-admin, a ximian-setup-tool frontend 

+ * for user administration.

+ * 

+ * Copyright (C) 2004 Carlos Garnacho

+ * Copyright (C) 2005 Carlos Garnacho, Sivan Greenberg

+ *

+ * This program is free software; you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as

+ * published by the Free Software Foundation; either version 2 of the

+ * License, or (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.

+ *

+ * Authors: Carlos Garnacho Parro <[email protected]>

+ *          Sivan Greenberg       <[email protected]>

+ */

+

+#ifdef HAVE_CONFIG_H

+#  include <config.h>

+#endif

+

+#include <gtk/gtk.h>

+

+#include "gst.h"

+#include "roles-table.h"

+#include "user_group.h"

+

+extern GstTool *tool;

+

+static void

+on_user_role_toggled (GtkCellRendererToggle *cell, gchar *path_str, gpointer data)

+{

+	GtkTreeModel *model = (GtkTreeModel*) data;

+	GtkTreePath  *path  = gtk_tree_path_new_from_string (path_str);

+	GtkTreeIter   iter;

+	gboolean      value;

+

+	gtk_tree_model_get_iter (GTK_TREE_MODEL (model), &iter, path);

+	gtk_tree_model_get (model, &iter, 0, &value, -1);

+	gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, !value, -1);

+}

+

+void

+create_roles_table (void)

+{

+	GtkTreeModel      *model;

+	GtkCellRenderer   *renderer;

+	GtkTreeViewColumn *column;

+	GtkTreeIter        iter;

+

+	GtkWidget *list = gst_dialog_get_widget (tool->main_dialog, "user_roles");

+

+	model = GTK_TREE_MODEL (gtk_list_store_new (3, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_STRING));

+

+	gtk_tree_view_set_model (GTK_TREE_VIEW (list), model);

+	g_object_unref (model);

+

+	column = gtk_tree_view_column_new ();

+

+	renderer = gtk_cell_renderer_toggle_new ();

+	gtk_tree_view_column_pack_start (column, renderer, FALSE);

+	gtk_tree_view_column_set_attributes (column,

+					     renderer,

+					     "active", 0,

+					     NULL);

+	g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (on_user_role_toggled), model);

+

+	renderer = gtk_cell_renderer_text_new ();

+	gtk_tree_view_column_pack_end (column, renderer, TRUE);

+	gtk_tree_view_column_set_attributes (column,

+					     renderer,

+					     "text", 1,

+					     NULL);

+

+	gtk_tree_view_column_set_sort_column_id (column, 1);

+	gtk_tree_view_insert_column (GTK_TREE_VIEW (list), column, 0);

+	gtk_tree_view_column_clicked (column);

+}

+

+#ifndef __sun

+#else /* __sun */

+static gboolean

+user_has_rbac_role( xmlNodePtr user_node, gchar *role_name ) 

+{

+    xmlNodePtr  user_role, assigned_roles, role;

+    gchar       *buf;

+    gboolean    rval = FALSE;

+

+    user_role = gst_xml_element_find_first (user_node, "role");

+

+    /* It's possible that the profile has no entries */

+    if (user_role == NULL)

+        return(FALSE);

+

+    assigned_roles = gst_xml_element_find_first (user_role, "rbac_roles");

+    g_return_val_if_fail( assigned_roles != NULL, FALSE );

+

+    for (role = gst_xml_element_find_first (assigned_roles, "rbac_role");

+         role != NULL;

+         role = gst_xml_element_find_next (role, "rbac_role")) {

+            buf = gst_xml_element_get_content (role);

+

+            if (strcmp (role_name, buf) == 0) {

+                g_free (buf);

+                rval = TRUE;

+                break;

+            }

+

+            g_free (buf);

+    }

+

+    return rval;

+}

+

+void

+populate_roles_table (GtkWidget *list, xmlNodePtr user_node)

+{

+	GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (list));

+	xmlNodePtr    roledb_root = get_root_node (NODE_ROLE);

+	xmlNodePtr    roles, role, user;

+	GtkTreeIter   iter;

+	gchar        *name, *desc, *buf;

+	gboolean      val;

+

+	gtk_list_store_clear (GTK_LIST_STORE (model));

+

+	roles = gst_xml_element_find_first (roledb_root, "rbac_roles");

+	for (role = gst_xml_element_find_first (roles, "rbac_role");

+	     role != NULL;

+	     role = gst_xml_element_find_next (role, "rbac_role")) {

+		name = gst_xml_get_child_content (role, "role");

+

+		if (name) {

+                        gchar *combined_str;

+

+			val = FALSE;

+

+			/* check whether the user already has RBAC profile */

+                        if (user_node ) {

+                            if ( user_has_rbac_role ( user_node, name )) {

+                                val = TRUE;

+                            }

+                        }

+

+                        combined_str = name;

+			

+			gtk_list_store_append (GTK_LIST_STORE (model), &iter);

+			gtk_list_store_set (GTK_LIST_STORE (model), &iter,

+					    0, val,

+					    1, combined_str,

+					    2, name,

+					    -1);

+                        if ( combined_str != name ) 

+                            g_free( combined_str );

+			g_free (name);

+		}

+	}

+}

+

+void

+roles_save_data (xmlNodePtr node )

+{

+        

+	GtkWidget    *list  = NULL;

+	GtkTreeModel *model = NULL;

+	GtkTreeIter   iter;

+	xmlNodePtr    role_node, rbac_roles_node, rbac_role_node;

+	gboolean      valid, active;

+	gchar        *name;

+

+	g_return_if_fail (node != NULL);

+

+	list  = gst_dialog_get_widget (tool->main_dialog, "user_roles");

+	model = gtk_tree_view_get_model (GTK_TREE_VIEW (list));

+	role_node = gst_xml_element_find_first (node, "role");

+        

+        if ( role_node != NULL ) {

+	    rbac_roles_node = gst_xml_element_find_first (role_node, "rbac_roles");

+            if (rbac_roles_node) {

+                gst_xml_element_destroy_children (rbac_roles_node);

+            }

+            else {

+                rbac_roles_node = gst_xml_element_add (node, "rbac_roles");