Modification to makefile --with-sudo-plugin-path

6 files changed, 35 insertions, 7 deletions

diff --git a/Makefile.am b/Makefile.am
index 37819e41..24eee962 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@ dbusintrospectdir = $(datarootdir)/sssd/introspect
 localedir = @localedir@
 nsslibdir = @nsslibdir@
 pamlibdir = @pammoddir@
-libsss_sudoplugindir = $(libexecdir)
+libsss_sudoplugindir = @sudo_pluginpath@
 
 dbpath = @dbpath@
 pluginpath = @pluginpath@
@@ -193,8 +193,7 @@ AM_CPPFLAGS = \
     -DSSS_NSS_SOCKET_NAME=\"$(pipepath)/nss\" \
     -DSSS_PAM_SOCKET_NAME=\"$(pipepath)/pam\" \
     -DSSS_PAM_PRIV_SOCKET_NAME=\"$(pipepath)/private/pam\" \
-    -DLOCALEDIR=\"$(localedir)\" \
-    -D_GNU_SOURCE
+    -DLOCALEDIR=\"$(localedir)\"
 
 EXTRA_DIST = build/config.rpath
 
@@ -778,7 +777,11 @@ libsss_sudoplugin_la_LDFLAGS = \
     -module \
     -lpam \
     -lpam_misc \
-    `pkg-config --cflags --libs dbus-1`  
+    $(DBUS_LIBS)
+
+libsss_sudoplugin_CPPFLAGS = \
+     $(AM_CPPFLAGS) \
+     -D_GNU_SOURCE
     
 
 ####################
diff --git a/configure.ac b/configure.ac
index 972c24c8..164523e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,6 +73,7 @@ m4_include([src/external/platform.m4])
 m4_include(src/conf_macros.m4)
 WITH_DB_PATH
 WITH_PLUGIN_PATH
+WITH_SUDO_PLUGIN_PATH
 WITH_PID_PATH
 WITH_LOG_PATH
 WITH_PUBCONF_PATH
diff --git a/src/conf_macros.m4 b/src/conf_macros.m4
index af9cb4f2..b626c89f 100644
--- a/src/conf_macros.m4
+++ b/src/conf_macros.m4
@@ -29,9 +29,28 @@ AC_DEFUN([WITH_PLUGIN_PATH],
         config_pluginpath=$with_plugin_path
     fi
     AC_SUBST(pluginpath)
-    AC_DEFINE_UNQUOTED(DATA_PROVIDER_PLUGINS_PATH, "$config_pluginpath", [Path to the SSSD data provider plugins])
+    AC_DEFINE_UNQUOTED(DATA_PROVIDER_PLUGINS_PATH, "$config_pluginpath", [Path to the SSSD sudo plugins])
   ])
 
+AC_DEFUN([WITH_SUDO_PLUGIN_PATH],
+  [ AC_ARG_WITH([sudo-plugin-path],
+                [AC_HELP_STRING([--with-sudo-plugin-path=PATH],
+                                [Path to the SSSD sudo plugins [/usr/lib/sudo]]
+                               )
+                ]
+               )
+    sudo_pluginpath="${libdir}/sudo"
+    sudo_config_pluginpath="\"LIBDIR\"/sudo"
+    if test x"$with_sudo_plugin_path" != x; then
+        sudo_pluginpath=$with_sudo_plugin_path
+        sudo_config_pluginpath=$with_sudo_plugin_path
+    fi
+    AC_SUBST(sudo_pluginpath)
+    AC_DEFINE_UNQUOTED(SUDO_PLUGINS_PATH, "$sudo_config_pluginpath", [Path to the SSSD data provider plugins])
+  ])
+
+
+
 AC_DEFUN([WITH_PID_PATH],
   [ AC_ARG_WITH([pid-path],
                 [AC_HELP_STRING([--with-pid-path=PATH],
diff --git a/src/responder/sudo/sudosrv.c b/src/responder/sudo/sudosrv.c
index 6353fd72..f6b4b1e7 100644
--- a/src/responder/sudo/sudosrv.c
+++ b/src/responder/sudo/sudosrv.c
@@ -2,6 +2,8 @@
    SSSD
 
    SUDO Responder
+   
+   Author - Arun Scaria <arunscaria91@gmail.com>
 
    Copyright (C)  Arun Scaria <arunscaria91@gmail.com> (2011)
 
diff --git a/src/sss_client/sudo_plugin/sss_sudo_cli.h b/src/sss_client/sudo_plugin/sss_sudo_cli.h
index 76dc242f..5bfa183f 100644
--- a/src/sss_client/sudo_plugin/sss_sudo_cli.h
+++ b/src/sss_client/sudo_plugin/sss_sudo_cli.h
@@ -6,7 +6,7 @@
     Authors:
         Arun Scaria <arunscaria91@gmail.com>
 
-    Copyright (C) 2011 Red Hat
+    Copyright (C) 2011 Arun Scaria <arunscaria91@gmail.com>
 
     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
diff --git a/src/sss_client/sudo_plugin/sss_sudoplugin.c b/src/sss_client/sudo_plugin/sss_sudoplugin.c
index 54bdbc8e..021ee8c9 100644
--- a/src/sss_client/sudo_plugin/sss_sudoplugin.c
+++ b/src/sss_client/sudo_plugin/sss_sudoplugin.c
@@ -6,12 +6,15 @@
     Authors:
         Arun Scaria <arunscaria91@gmail.com>
 
-    Copyright (C) 2011 Red Hat
+    Copyright (C) 2011 Arun Scaria <arunscaria91@gmail.com>.
 
     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 3 of the License, or
     (at your option) any later version.
+    
+    The coding of some of the components in this programe is based on the 
+    code adapted from the sudo project at www.sudo.ws
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of