From: Andrea Zagli Date: Tue, 8 Sep 2015 13:47:30 +0000 (+0200) Subject: Changes consequently to libzakauthe. X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=8bb957864611a4f5b49392c2b73614a4e1bb58a8;p=zakauthe%2Fplugins%2Fsmbldap Changes consequently to libzakauthe. --- diff --git a/.gitignore b/.gitignore index 7315df9..0907eed 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,6 @@ missing config.h stamp-h1 tests/test -tools/aute-db-mkpwd +tests/test_get_password *.tar.gz *.exe diff --git a/autogen.sh b/autogen.sh index 625ce6d..a261636 100755 --- a/autogen.sh +++ b/autogen.sh @@ -4,13 +4,13 @@ srcdir=`dirname $0` test -z "$srcdir" && srcdir=. -PKG_NAME="libaute-smbldap" +PKG_NAME="libzakauthesmbldap" (test -f $srcdir/configure.ac \ && test -d $srcdir/src \ && test -f $srcdir/src/aute_smbldap.c) || { echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level libaute-smbldap directory" + echo " top-level libzakauthesmbldap directory" exit 1 } diff --git a/configure.ac b/configure.ac index e3dbdc2..6672955 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([libaute-smbldap], [0.5.0], [azagli@libero.it]) +AC_INIT([libzakauthesmbldap], [0.5.0], [azagli@libero.it]) AC_CONFIG_SRCDIR([src/aute_smbldap.c]) AC_CONFIG_HEADER([config.h]) @@ -22,7 +22,7 @@ AC_PROG_LIBTOOL # Checks for libraries. PKG_CHECK_MODULES(LIBAUTESMBLDAP, [gtk+-3.0 >= 3.0.0 - libaute >= 0.2.0]) + libzakauthe >= 0.5.0]) AC_SUBST(LIBAUTESMBLDAP_CFLAGS) AC_SUBST(LIBAUTESMBLDAP_LIBS) @@ -67,10 +67,10 @@ AC_CONFIG_FILES([ src/Makefile tests/Makefile data/Makefile - data/libaute-smbldap/Makefile - data/libaute-smbldap/gui/Makefile + data/libzakauthesmbldap/Makefile + data/libzakauthesmbldap/gui/Makefile doc/Makefile - doc/libaute-smbldap/Makefile - doc/libaute-smbldap/examples/Makefile + doc/libzakauthesmbldap/Makefile + doc/libzakauthesmbldap/examples/Makefile ]) AC_OUTPUT diff --git a/data/Makefile.am b/data/Makefile.am index 5909f74..74bbe46 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = libaute-smbldap +SUBDIRS = libzakauthesmbldap -EXTRA_DIST = +EXTRA_DIST = diff --git a/data/libaute-smbldap/Makefile.am b/data/libaute-smbldap/Makefile.am deleted file mode 100644 index 13c2b3d..0000000 --- a/data/libaute-smbldap/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = gui diff --git a/data/libaute-smbldap/gui/Makefile.am b/data/libaute-smbldap/gui/Makefile.am deleted file mode 100644 index dcf83ac..0000000 --- a/data/libaute-smbldap/gui/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -guidir = $(datadir)/libaute-smbldap/gui - -gui_DATA = autesmbldap.gui - -EXTRA_DIST = $(gui_DATA) diff --git a/data/libaute-smbldap/gui/autesmbldap.gui b/data/libaute-smbldap/gui/autesmbldap.gui deleted file mode 100644 index a4fd050..0000000 --- a/data/libaute-smbldap/gui/autesmbldap.gui +++ /dev/null @@ -1,818 +0,0 @@ - - - - - - True - Autenticazione - True - center - dialog - - - True - vertical - - - True - 5 - 3 - 2 - 5 - 5 - - - True - 0 - Utente - - - GTK_FILL - - - - - - True - 0 - Password - - - 1 - 2 - GTK_FILL - - - - - - True - True - True - - - 1 - 2 - - - - - - True - True - False - True - - - 1 - 2 - 1 - 2 - - - - - - True - True - - - True - 5 - 2 - 2 - 5 - 5 - - - True - 0 - Nuova - - - GTK_FILL - - - - - - True - 0 - Conferma - - - 1 - 2 - GTK_FILL - - - - - - True - True - False - True - - - 1 - 2 - - - - - - True - True - False - True - - - 1 - 2 - 1 - 2 - - - - - - - - True - _Cambia password - True - - - - - 2 - 2 - 3 - GTK_FILL - - - - - 2 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - True - False - True - - - False - False - 1 - - - - - False - end - 0 - - - - - - cancelbutton1 - okbutton1 - - - - - - - - - - - - - - - - - - - - - - - - - - True - 5 - vertical - 5 - - - True - True - - - True - True - automatic - automatic - etched-in - - - True - True - lstore_users - False - 0 - - - Status - - - - 0 - - - - - - - CN - - - - 1 - - - - - - - Name - - - - 2 - - - - - - - UID - - - 1 - - - 3 - - - - - - - - - - - True - Users - - - False - - - - - True - True - automatic - automatic - etched-in - - - True - True - lstore_groups - - - CN - - - - 0 - - - - - - - GID - - - 1 - - - 1 - - - - - - - - - 1 - - - - - True - Groups - - - 1 - False - - - - - 0 - - - - - True - 5 - end - - - gtk-new - True - True - True - True - - - False - False - 0 - - - - - gtk-edit - True - True - True - True - - - False - False - 1 - - - - - gtk-delete - True - True - True - True - - - False - False - 2 - - - - - gtk-find - True - True - True - True - - - False - False - 3 - - - - - False - 1 - - - - - - - User - True - center-on-parent - 300 - True - - - True - 5 - vertical - 5 - - - True - 7 - 2 - 5 - 5 - - - True - 0 - CN - - - GTK_FILL - GTK_FILL - - - - - True - 0 - Surname - - - 2 - 3 - GTK_FILL - GTK_FILL - - - - - True - 0 - Name - - - 3 - 4 - GTK_FILL - GTK_FILL - - - - - True - 0 - Enabled - - - 4 - 5 - GTK_FILL - GTK_FILL - - - - - True - 0 - Password expiration - - - 5 - 6 - GTK_FILL - GTK_FILL - - - - - True - 0 - 0 - Description - - - 6 - 7 - GTK_FILL - GTK_FILL - - - - - True - True - False - True - - - 1 - 2 - 4 - 5 - GTK_FILL - - - - - True - True - ● - - - 1 - 2 - GTK_FILL - - - - - True - True - ● - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - True - True - ● - - - 1 - 2 - 3 - 4 - GTK_FILL - - - - - True - True - 19 - ● - - - 1 - 2 - 5 - 6 - GTK_FILL - - - - - True - True - automatic - automatic - etched-in - - - True - True - - - - - 1 - 2 - 6 - 7 - - - - - True - 0 - UID - - - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - 0 - lbl_uid - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - 0 - - - - - True - 5 - end - - - gtk-cancel - True - True - True - True - - - False - False - 0 - - - - - gtk-save - True - True - True - True - - - False - False - 1 - - - - - False - 1 - - - - - - - Group - True - center-on-parent - 500 - True - - - True - 5 - vertical - 5 - - - True - 2 - 2 - 5 - 5 - - - True - 0 - CN - - - GTK_FILL - GTK_FILL - - - - - True - True - ● - - - 1 - 2 - GTK_FILL - - - - - True - 0 - GID - - - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - 0 - lbl_gid - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - 0 - - - - - True - 5 - end - - - gtk-cancel - True - True - True - True - - - False - False - 0 - - - - - gtk-save - True - True - True - True - - - False - False - 1 - - - - - False - 1 - - - - - - diff --git a/data/libzakauthesmbldap/Makefile.am b/data/libzakauthesmbldap/Makefile.am new file mode 100644 index 0000000..13c2b3d --- /dev/null +++ b/data/libzakauthesmbldap/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = gui diff --git a/data/libzakauthesmbldap/gui/Makefile.am b/data/libzakauthesmbldap/gui/Makefile.am new file mode 100644 index 0000000..685789c --- /dev/null +++ b/data/libzakauthesmbldap/gui/Makefile.am @@ -0,0 +1,5 @@ +guidir = $(datadir)/$(PKGNAME)/gui + +gui_DATA = zak_authe_smbldap.ui + +EXTRA_DIST = $(gui_DATA) diff --git a/data/libzakauthesmbldap/gui/zak_authe_smbldap.ui b/data/libzakauthesmbldap/gui/zak_authe_smbldap.ui new file mode 100644 index 0000000..a4fd050 --- /dev/null +++ b/data/libzakauthesmbldap/gui/zak_authe_smbldap.ui @@ -0,0 +1,818 @@ + + + + + + True + Autenticazione + True + center + dialog + + + True + vertical + + + True + 5 + 3 + 2 + 5 + 5 + + + True + 0 + Utente + + + GTK_FILL + + + + + + True + 0 + Password + + + 1 + 2 + GTK_FILL + + + + + + True + True + True + + + 1 + 2 + + + + + + True + True + False + True + + + 1 + 2 + 1 + 2 + + + + + + True + True + + + True + 5 + 2 + 2 + 5 + 5 + + + True + 0 + Nuova + + + GTK_FILL + + + + + + True + 0 + Conferma + + + 1 + 2 + GTK_FILL + + + + + + True + True + False + True + + + 1 + 2 + + + + + + True + True + False + True + + + 1 + 2 + 1 + 2 + + + + + + + + True + _Cambia password + True + + + + + 2 + 2 + 3 + GTK_FILL + + + + + 2 + + + + + True + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + True + False + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + cancelbutton1 + okbutton1 + + + + + + + + + + + + + + + + + + + + + + + + + + True + 5 + vertical + 5 + + + True + True + + + True + True + automatic + automatic + etched-in + + + True + True + lstore_users + False + 0 + + + Status + + + + 0 + + + + + + + CN + + + + 1 + + + + + + + Name + + + + 2 + + + + + + + UID + + + 1 + + + 3 + + + + + + + + + + + True + Users + + + False + + + + + True + True + automatic + automatic + etched-in + + + True + True + lstore_groups + + + CN + + + + 0 + + + + + + + GID + + + 1 + + + 1 + + + + + + + + + 1 + + + + + True + Groups + + + 1 + False + + + + + 0 + + + + + True + 5 + end + + + gtk-new + True + True + True + True + + + False + False + 0 + + + + + gtk-edit + True + True + True + True + + + False + False + 1 + + + + + gtk-delete + True + True + True + True + + + False + False + 2 + + + + + gtk-find + True + True + True + True + + + False + False + 3 + + + + + False + 1 + + + + + + + User + True + center-on-parent + 300 + True + + + True + 5 + vertical + 5 + + + True + 7 + 2 + 5 + 5 + + + True + 0 + CN + + + GTK_FILL + GTK_FILL + + + + + True + 0 + Surname + + + 2 + 3 + GTK_FILL + GTK_FILL + + + + + True + 0 + Name + + + 3 + 4 + GTK_FILL + GTK_FILL + + + + + True + 0 + Enabled + + + 4 + 5 + GTK_FILL + GTK_FILL + + + + + True + 0 + Password expiration + + + 5 + 6 + GTK_FILL + GTK_FILL + + + + + True + 0 + 0 + Description + + + 6 + 7 + GTK_FILL + GTK_FILL + + + + + True + True + False + True + + + 1 + 2 + 4 + 5 + GTK_FILL + + + + + True + True + ● + + + 1 + 2 + GTK_FILL + + + + + True + True + ● + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + True + True + ● + + + 1 + 2 + 3 + 4 + GTK_FILL + + + + + True + True + 19 + ● + + + 1 + 2 + 5 + 6 + GTK_FILL + + + + + True + True + automatic + automatic + etched-in + + + True + True + + + + + 1 + 2 + 6 + 7 + + + + + True + 0 + UID + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + 0 + lbl_uid + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + 0 + + + + + True + 5 + end + + + gtk-cancel + True + True + True + True + + + False + False + 0 + + + + + gtk-save + True + True + True + True + + + False + False + 1 + + + + + False + 1 + + + + + + + Group + True + center-on-parent + 500 + True + + + True + 5 + vertical + 5 + + + True + 2 + 2 + 5 + 5 + + + True + 0 + CN + + + GTK_FILL + GTK_FILL + + + + + True + True + ● + + + 1 + 2 + GTK_FILL + + + + + True + 0 + GID + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + 0 + lbl_gid + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + 0 + + + + + True + 5 + end + + + gtk-cancel + True + True + True + True + + + False + False + 0 + + + + + gtk-save + True + True + True + True + + + False + False + 1 + + + + + False + 1 + + + + + + diff --git a/doc/Makefile.am b/doc/Makefile.am index 5909f74..74bbe46 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = libaute-smbldap +SUBDIRS = libzakauthesmbldap -EXTRA_DIST = +EXTRA_DIST = diff --git a/doc/libaute-smbldap/Makefile.am b/doc/libaute-smbldap/Makefile.am deleted file mode 100644 index aee2d7b..0000000 --- a/doc/libaute-smbldap/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = examples diff --git a/doc/libaute-smbldap/examples/Makefile.am b/doc/libaute-smbldap/examples/Makefile.am deleted file mode 100644 index 97551eb..0000000 --- a/doc/libaute-smbldap/examples/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -libautesmbldap_examplesdir = $(docdir)/examples - -libautesmbldap_examples_DATA = \ - libaute-smbldap.conf - -EXTRA_DIST = $(libautesmbldap_examples_DATA) - diff --git a/doc/libaute-smbldap/examples/libaute-smbldap.conf b/doc/libaute-smbldap/examples/libaute-smbldap.conf deleted file mode 100644 index e5b6c99..0000000 --- a/doc/libaute-smbldap/examples/libaute-smbldap.conf +++ /dev/null @@ -1,7 +0,0 @@ -[AUTE] -plugin=/usr/local/lib/libaute/plugins/libaute-smbldap -host=ldap://10.0.0.102/ -base_dn=dc=nodomain -users_ou=ou=Users -groups_ou=ou=Groups -user_field=uid diff --git a/doc/libzakauthesmbldap/Makefile.am b/doc/libzakauthesmbldap/Makefile.am new file mode 100644 index 0000000..aee2d7b --- /dev/null +++ b/doc/libzakauthesmbldap/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = examples diff --git a/doc/libzakauthesmbldap/examples/Makefile.am b/doc/libzakauthesmbldap/examples/Makefile.am new file mode 100644 index 0000000..c5749e9 --- /dev/null +++ b/doc/libzakauthesmbldap/examples/Makefile.am @@ -0,0 +1,6 @@ +libzakauthesmbldap_examplesdir = $(docdir)/examples + +libzakauthesmbldap_examples_DATA = \ + libzakauthesmbldap.conf + +EXTRA_DIST = $(libzakauthesmbldap_examples_DATA) diff --git a/doc/libzakauthesmbldap/examples/libzakauthesmbldap.conf b/doc/libzakauthesmbldap/examples/libzakauthesmbldap.conf new file mode 100644 index 0000000..e5b6c99 --- /dev/null +++ b/doc/libzakauthesmbldap/examples/libzakauthesmbldap.conf @@ -0,0 +1,7 @@ +[AUTE] +plugin=/usr/local/lib/libaute/plugins/libaute-smbldap +host=ldap://10.0.0.102/ +base_dn=dc=nodomain +users_ou=ou=Users +groups_ou=ou=Groups +user_field=uid diff --git a/src/Makefile.am b/src/Makefile.am index 833be51..3ea441e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -guidir = $(datadir)/libaute-smbldap/gui +guidir = $(datadir)/$(PKGNAME)/gui AM_CPPFLAGS = $(LIBAUTESMBLDAP_CFLAGS) \ $(LIBLDAP_CFLAGS) \ @@ -11,14 +11,14 @@ LIBS = $(LIBAUTESMBLDAP_LIBS) \ $(LIBSSH_LIBS) \ $(LIBCONFI_LIBS) -libaute_pluginsdir = $(libdir)/libaute/plugins -libaute_plugins_LTLIBRARIES = libaute-smbldap.la +libzakauthe_pluginsdir = $(libdir)/libzakauthe/plugins +libzakauthe_plugins_LTLIBRARIES = libzakauthesmbldap.la -libaute_smbldap_la_SOURCES = aute_smbldap.c \ +libzakauthesmbldap_la_SOURCES = aute_smbldap.c \ aute_smbldap.h \ user.c \ user.h \ group.c \ group.h -libaute_smbldap_la_LDFLAGS = -no-undefined +libzakauthesmbldap_la_LDFLAGS = -no-undefined diff --git a/src/aute_smbldap.c b/src/aute_smbldap.c index 7e9b634..d8cfb9f 100644 --- a/src/aute_smbldap.c +++ b/src/aute_smbldap.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2013 Andrea Zagli + * Copyright (C) 2010-2015 Andrea Zagli * * 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 @@ -19,11 +19,13 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif - + #ifdef G_OS_WIN32 #include #endif +#include + #include #include #include @@ -38,6 +40,7 @@ static GtkBuilder *gtkbuilder; +static gchar *guidir; static gchar *guifile; static gchar *formdir; @@ -148,7 +151,7 @@ get_connection_parameters_from_confi (Confi *confi, gchar **user_field) #endif static GtkWindow -*autesmbldap_get_gtkwidget_parent_gtkwindow (GtkWidget *widget) +*zak_authe_smbldap_get_gtkwidget_parent_gtkwindow (GtkWidget *widget) { GtkWindow *w; GtkWidget *w_parent; @@ -170,7 +173,7 @@ static GtkWindow } void -autesmbldap_exec_ssh_command (const gchar *command) +zak_authe_smbldap_exec_ssh_command (const gchar *command) { int rc; char buf[4096]; @@ -278,7 +281,7 @@ autesmbldap_exec_ssh_command (const gchar *command) } static void -autesmbldap_disconnect_ssh () +zak_authe_smbldap_disconnect_ssh () { if (channel != NULL) { @@ -476,7 +479,7 @@ static gchar /* cambio la password */ gchar *command = g_strdup_printf ("echo -e \"%s\\n\" | sudo -k -S echo -e \"%s\\\\n%s\\\\n\" | sudo /usr/sbin/smbldap-passwd \"%s\"", password, password_nuova, password_nuova, utente); - autesmbldap_exec_ssh_command (command); + zak_authe_smbldap_exec_ssh_command (command); } } @@ -484,7 +487,7 @@ static gchar } static void -autesmbldap_load_users_list () +zak_authe_smbldap_load_users_list () { int retldap; LDAPMessage *result; @@ -566,13 +569,13 @@ autesmbldap_load_users_list () ber_free (ber, 0); } - entry = ldap_next_entry (ldap, entry); + entry = ldap_next_entry (ldap, entry); } ldap_msgfree (result); } static void -autesmbldap_load_groups_list () +zak_authe_smbldap_load_groups_list () { int retldap; LDAPMessage *result; @@ -648,24 +651,24 @@ autesmbldap_load_groups_list () ber_free (ber, 0); } - entry = ldap_next_entry (ldap, entry); + entry = ldap_next_entry (ldap, entry); } } static void -autesmbldap_on_user_aggiornato (gpointer instance, gpointer user_data) +zak_authe_smbldap_on_user_aggiornato (gpointer instance, gpointer user_data) { - autesmbldap_load_users_list (); + zak_authe_smbldap_load_users_list (); } static void -autesmbldap_on_group_aggiornato (gpointer instance, gpointer user_data) +zak_authe_smbldap_on_group_aggiornato (gpointer instance, gpointer user_data) { - autesmbldap_load_groups_list (); + zak_authe_smbldap_load_groups_list (); } static void -autesmbldap_edit_user () +zak_authe_smbldap_edit_user () { GtkTreeIter iter; gchar *cn; @@ -694,7 +697,7 @@ autesmbldap_edit_user () } else { - dialog = gtk_message_dialog_new (autesmbldap_get_gtkwidget_parent_gtkwindow (w_users), + dialog = gtk_message_dialog_new (zak_authe_smbldap_get_gtkwidget_parent_gtkwindow (w_users), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, @@ -713,7 +716,7 @@ autesmbldap_edit_user () User *u = user_new (gtkbuilder, guifile, ldap, cn, users_ou, base_dn); g_signal_connect (G_OBJECT (u), "aggiornato", - G_CALLBACK (autesmbldap_on_user_aggiornato), NULL); + G_CALLBACK (zak_authe_smbldap_on_user_aggiornato), NULL); w = user_get_widget (u); } @@ -722,13 +725,13 @@ autesmbldap_edit_user () Group *u = group_new (gtkbuilder, guifile, ldap, cn, groups_ou, base_dn); g_signal_connect (G_OBJECT (u), "aggiornato", - G_CALLBACK (autesmbldap_on_group_aggiornato), NULL); + G_CALLBACK (zak_authe_smbldap_on_group_aggiornato), NULL); w = group_get_widget (u); } else { - dialog = gtk_message_dialog_new (autesmbldap_get_gtkwidget_parent_gtkwindow (w_users), + dialog = gtk_message_dialog_new (zak_authe_smbldap_get_gtkwidget_parent_gtkwindow (w_users), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, @@ -736,12 +739,12 @@ autesmbldap_edit_user () return; } - gtk_window_set_transient_for (GTK_WINDOW (w), autesmbldap_get_gtkwidget_parent_gtkwindow (w_users)); + gtk_window_set_transient_for (GTK_WINDOW (w), zak_authe_smbldap_get_gtkwidget_parent_gtkwindow (w_users)); gtk_widget_show (w); } else { - GtkWidget *dialog = gtk_message_dialog_new (autesmbldap_get_gtkwidget_parent_gtkwindow (w_users), + GtkWidget *dialog = gtk_message_dialog_new (zak_authe_smbldap_get_gtkwidget_parent_gtkwindow (w_users), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, @@ -752,7 +755,7 @@ autesmbldap_edit_user () } static void -autesmbldap_on_btn_new_clicked (GtkButton *button, +zak_authe_smbldap_on_btn_new_clicked (GtkButton *button, gpointer user_data) { GtkWidget *dialog; @@ -763,7 +766,7 @@ autesmbldap_on_btn_new_clicked (GtkButton *button, User *u = user_new (gtkbuilder, guifile, ldap, "", users_ou, base_dn); g_signal_connect (G_OBJECT (u), "aggiornato", - G_CALLBACK (autesmbldap_on_user_aggiornato), NULL); + G_CALLBACK (zak_authe_smbldap_on_user_aggiornato), NULL); w = user_get_widget (u); } @@ -772,13 +775,13 @@ autesmbldap_on_btn_new_clicked (GtkButton *button, Group *u = group_new (gtkbuilder, guifile, ldap, "", groups_ou, base_dn); g_signal_connect (G_OBJECT (u), "aggiornato", - G_CALLBACK (autesmbldap_on_group_aggiornato), NULL); + G_CALLBACK (zak_authe_smbldap_on_group_aggiornato), NULL); w = group_get_widget (u); } else { - dialog = gtk_message_dialog_new (autesmbldap_get_gtkwidget_parent_gtkwindow (w_users), + dialog = gtk_message_dialog_new (zak_authe_smbldap_get_gtkwidget_parent_gtkwindow (w_users), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, @@ -786,19 +789,19 @@ autesmbldap_on_btn_new_clicked (GtkButton *button, return; } - gtk_window_set_transient_for (GTK_WINDOW (w), autesmbldap_get_gtkwidget_parent_gtkwindow (w_users)); + gtk_window_set_transient_for (GTK_WINDOW (w), zak_authe_smbldap_get_gtkwidget_parent_gtkwindow (w_users)); gtk_widget_show (w); } - + static void -autesmbldap_on_btn_edit_clicked (GtkButton *button, +zak_authe_smbldap_on_btn_edit_clicked (GtkButton *button, gpointer user_data) { - autesmbldap_edit_user (); + zak_authe_smbldap_edit_user (); } - + static void -autesmbldap_on_btn_delete_clicked (GtkButton *button, +zak_authe_smbldap_on_btn_delete_clicked (GtkButton *button, gpointer user_data) { GtkWidget *dialog; @@ -819,7 +822,7 @@ autesmbldap_on_btn_delete_clicked (GtkButton *button, lstore = lstore_users; selection = sel_users; str_type = g_strdup ("user"); - load_list = &autesmbldap_load_users_list; + load_list = &zak_authe_smbldap_load_users_list; col_cn = COL_USERS_CN; command = g_strdup ("sudo /usr/sbin/smbldap-userdel -r "); } @@ -828,13 +831,13 @@ autesmbldap_on_btn_delete_clicked (GtkButton *button, lstore = lstore_groups; selection = sel_groups; str_type = g_strdup ("group"); - load_list = &autesmbldap_load_groups_list; + load_list = &zak_authe_smbldap_load_groups_list; col_cn = COL_GROUPS_CN; command = g_strdup ("sudo /usr/sbin/smbldap-groupdel "); } else { - dialog = gtk_message_dialog_new (autesmbldap_get_gtkwidget_parent_gtkwindow (w_users), + dialog = gtk_message_dialog_new (zak_authe_smbldap_get_gtkwidget_parent_gtkwindow (w_users), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, @@ -844,7 +847,7 @@ autesmbldap_on_btn_delete_clicked (GtkButton *button, if (gtk_tree_selection_get_selected (selection, NULL, &iter)) { - dialog = gtk_message_dialog_new (autesmbldap_get_gtkwidget_parent_gtkwindow (w_users), + dialog = gtk_message_dialog_new (zak_authe_smbldap_get_gtkwidget_parent_gtkwindow (w_users), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, @@ -857,7 +860,7 @@ autesmbldap_on_btn_delete_clicked (GtkButton *button, col_cn, &cn, -1); - autesmbldap_exec_ssh_command (g_strdup_printf ("%s%s", command, cn)); + zak_authe_smbldap_exec_ssh_command (g_strdup_printf ("%s%s", command, cn)); (*load_list) (); } @@ -865,7 +868,7 @@ autesmbldap_on_btn_delete_clicked (GtkButton *button, } else { - dialog = gtk_message_dialog_new (autesmbldap_get_gtkwidget_parent_gtkwindow (w_users), + dialog = gtk_message_dialog_new (zak_authe_smbldap_get_gtkwidget_parent_gtkwindow (w_users), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, @@ -876,32 +879,32 @@ autesmbldap_on_btn_delete_clicked (GtkButton *button, } static void -autesmbldap_on_trv_users_row_activated (GtkTreeView *tree_view, +zak_authe_smbldap_on_trv_users_row_activated (GtkTreeView *tree_view, GtkTreePath *tree_path, GtkTreeViewColumn *column, gpointer user_data) { - autesmbldap_edit_user (); + zak_authe_smbldap_edit_user (); } static void -autesmbldap_on_trv_groups_row_activated (GtkTreeView *tree_view, +zak_authe_smbldap_on_trv_groups_row_activated (GtkTreeView *tree_view, GtkTreePath *tree_path, GtkTreeViewColumn *column, gpointer user_data) { - autesmbldap_edit_user (); + zak_authe_smbldap_edit_user (); } static void -autesmbldap_on_btn_find_clicked (GtkButton *button, +zak_authe_smbldap_on_btn_find_clicked (GtkButton *button, gpointer user_data) { } - + /* PUBLIC */ gchar -*autentica_get_password (GSList *parameters, gchar **password) +*zak_authe_plg_get_password (GSList *parameters, gchar **password) { GError *error; gchar *ret = NULL; @@ -911,8 +914,6 @@ gchar gtkbuilder = gtk_builder_new (); #ifdef G_OS_WIN32 - gchar *guidir; - gchar *moddir; gchar *p; @@ -934,7 +935,7 @@ gchar #endif - guifile = g_build_filename (guidir, "autesmbldap.gui", NULL); + guifile = g_build_filename (guidir, "zak_authe_smbldap.ui", NULL); if (!gtk_builder_add_objects_from_file (gtkbuilder, guifile, g_strsplit ("diag_main", "|", -1), &error)) @@ -997,16 +998,16 @@ gchar } gchar -*autentica (GSList *parameters) +*zak_authe_plg_authe (GSList *parameters) { - return autentica_get_password (parameters, NULL); + return zak_authe_plg_get_password (parameters, NULL); } static void -autesmbldap_on_vbx_users_list_destroy (GtkWidget *object, +zak_authe_smbldap_on_vbx_users_list_destroy (GtkWidget *object, gpointer user_data) { - autesmbldap_disconnect_ssh (); + zak_authe_smbldap_disconnect_ssh (); } /** @@ -1015,7 +1016,7 @@ autesmbldap_on_vbx_users_list_destroy (GtkWidget *object, * */ GtkWidget -*get_management_gui (GSList *parameters) +*zak_aute_plg_get_management_gui (GSList *parameters) { GError *error; @@ -1028,10 +1029,10 @@ GtkWidget gchar *GUIDIR; - GUIDIR = g_build_filename (g_win32_get_package_installation_directory_of_module (NULL), "share", "libaute-db", "gu", NULL); + GUIDIR = g_build_filename (g_win32_get_package_installation_directory_of_module (NULL), "share", "libzakauthesmbldap", "gui", NULL); #endif - if (!gtk_builder_add_objects_from_file (gtkbuilder, g_build_filename (GUIDIR, "autesmbldap.gui", NULL), + if (!gtk_builder_add_objects_from_file (gtkbuilder, g_build_filename (GUIDIR, "zak_authe_smbldap.ui", NULL), g_strsplit ("lstore_users|lstore_groups|vbx_users_list", "|", -1), &error)) { @@ -1047,7 +1048,7 @@ GtkWidget } g_signal_connect (gtk_builder_get_object (gtkbuilder, "vbx_users_list"), - "destroy", G_CALLBACK (autesmbldap_on_vbx_users_list_destroy), NULL); + "destroy", G_CALLBACK (zak_authe_smbldap_on_vbx_users_list_destroy), NULL); notebook = GTK_WIDGET (gtk_builder_get_object (gtkbuilder, "notebook1")); @@ -1060,21 +1061,21 @@ GtkWidget sel_groups = gtk_tree_view_get_selection (trv_groups); g_signal_connect (gtk_builder_get_object (gtkbuilder, "treeview1"), - "row-activated", G_CALLBACK (autesmbldap_on_trv_users_row_activated), NULL); + "row-activated", G_CALLBACK (zak_authe_smbldap_on_trv_users_row_activated), NULL); g_signal_connect (gtk_builder_get_object (gtkbuilder, "treeview2"), - "row-activated", G_CALLBACK (autesmbldap_on_trv_groups_row_activated), NULL); + "row-activated", G_CALLBACK (zak_authe_smbldap_on_trv_groups_row_activated), NULL); g_signal_connect (G_OBJECT (gtk_builder_get_object (gtkbuilder, "button1")), "clicked", - G_CALLBACK (autesmbldap_on_btn_new_clicked), NULL); + G_CALLBACK (zak_authe_smbldap_on_btn_new_clicked), NULL); g_signal_connect (G_OBJECT (gtk_builder_get_object (gtkbuilder, "button2")), "clicked", - G_CALLBACK (autesmbldap_on_btn_edit_clicked), NULL); + G_CALLBACK (zak_authe_smbldap_on_btn_edit_clicked), NULL); g_signal_connect (G_OBJECT (gtk_builder_get_object (gtkbuilder, "button3")), "clicked", - G_CALLBACK (autesmbldap_on_btn_delete_clicked), NULL); + G_CALLBACK (zak_authe_smbldap_on_btn_delete_clicked), NULL); g_signal_connect (G_OBJECT (gtk_builder_get_object (gtkbuilder, "button4")), "clicked", - G_CALLBACK (autesmbldap_on_btn_find_clicked), NULL); + G_CALLBACK (zak_authe_smbldap_on_btn_find_clicked), NULL); - autesmbldap_load_users_list (); - autesmbldap_load_groups_list (); + zak_authe_smbldap_load_users_list (); + zak_authe_smbldap_load_groups_list (); return w_users; } diff --git a/src/aute_smbldap.h b/src/aute_smbldap.h index 3db7e60..2ed27a4 100644 --- a/src/aute_smbldap.h +++ b/src/aute_smbldap.h @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2010 Andrea Zagli +/* + * Copyright (C) 2010-2015 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,13 +17,13 @@ * */ -#ifndef __AUTESMBLDAP_H__ -#define __AUTESMBLDAP_H__ +#ifndef __ZAKAUTHESMBLDAP_H__ +#define __ZAKAUTHESMBLDAP_H__ G_BEGIN_DECLS -void autesmbldap_exec_ssh_command (const gchar *command); +void zak_authe_smbldap_exec_ssh_command (const gchar *command); G_END_DECLS -#endif /* __AUTESMBLDAP_H__ */ +#endif /* __ZAKAUTHESMBLDAP_H__ */ diff --git a/src/group.c b/src/group.c index b7b5757..808a8a1 100644 --- a/src/group.c +++ b/src/group.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2010 Andrea Zagli +/* + * Copyright (C) 2010-2015 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -245,14 +245,14 @@ group_salva (Group *group) if (g_strcmp0 (priv->cn, "") == 0) { - autesmbldap_exec_ssh_command (g_strdup_printf ("sudo /usr/sbin/smbldap-groupadd -a \"%s\"", + zak_authe_smbldap_exec_ssh_command (g_strdup_printf ("sudo /usr/sbin/smbldap-groupadd -a \"%s\"", gtk_entry_get_text (GTK_ENTRY (priv->txt_cn)))); priv->cn = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->txt_cn))); group_carica (group); } else { - autesmbldap_exec_ssh_command (g_strdup_printf ("sudo /usr/sbin/smbldap-groupmod -n \"%s\" \"%s\"", + zak_authe_smbldap_exec_ssh_command (g_strdup_printf ("sudo /usr/sbin/smbldap-groupmod -n \"%s\" \"%s\"", gtk_entry_get_text (GTK_ENTRY (priv->txt_cn)), priv->cn)); } diff --git a/tests/Makefile.am b/tests/Makefile.am index b77fae1..26a9569 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -6,7 +6,7 @@ AM_CPPFLAGS = $(WARN_CFLAGS) \ LIBS = $(GTK_LIBS) \ $(LIBAUTESMBLDAP_LIBS) -LDADD = ../src/libaute-smbldap.la +LDADD = ../src/libzakauthesmbldap.la noinst_PROGRAMS = test \ test_get_password diff --git a/tests/test.c b/tests/test.c index 5304075..3ee66c5 100644 --- a/tests/test.c +++ b/tests/test.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Andrea Zagli + * Copyright (C) 2013-2015 Andrea Zagli * * 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 @@ -18,17 +18,17 @@ #include -#include +#include int main (int argc, char **argv) { - Aute *aute; + ZakAuthe *aute; GSList *params; gtk_init (&argc, &argv); - aute = aute_new (); + aute = zak_authe_new (); params = g_slist_append (params, argv[1]); params = g_slist_append (params, argv[2]); @@ -37,9 +37,9 @@ main (int argc, char **argv) params = g_slist_append (params, argv[5]); params = g_slist_append (params, argv[6]); - aute_set_config (aute, params); + zak_authe_set_config (aute, params); - g_message ("User: %s\n", aute_autentica (aute)); + g_message ("User: %s\n", zak_authe_authe (aute)); return 0; } diff --git a/tests/test_get_password.c b/tests/test_get_password.c index 7d90dfa..292c73d 100644 --- a/tests/test_get_password.c +++ b/tests/test_get_password.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Andrea Zagli + * Copyright (C) 2013-2015 Andrea Zagli * * 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 @@ -18,12 +18,12 @@ #include -#include +#include int main (int argc, char **argv) { - Aute *aute; + ZakAuthe *aute; GSList *params; gchar *user; @@ -31,7 +31,7 @@ main (int argc, char **argv) gtk_init (&argc, &argv); - aute = aute_new (); + aute = zak_authe_new (); params = g_slist_append (params, argv[1]); params = g_slist_append (params, argv[2]); @@ -40,10 +40,10 @@ main (int argc, char **argv) params = g_slist_append (params, argv[5]); params = g_slist_append (params, argv[6]); - aute_set_config (aute, params); + zak_authe_set_config (aute, params); password = NULL; - user = aute_autentica_get_password (aute, &password); + user = zak_authe_get_password (aute, &password); g_message ("User: %s - Password: %s\n", user, password); return 0;