summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorArun Scaria <arunscaria91@gmail.com>2011-06-23 21:09:38 +0530
committerArun Scaria <arunscaria91@gmail.com>2011-06-23 21:09:38 +0530
commitfed71ab33e5b7842f94c1b5af139b45338c362fc (patch)
tree9219b38aaa8a2ad6069fe3395096bdc50d3816e0 /src
parentb061ea033e8225a4fd185745a8734a98be5b01cb (diff)
downloadsssd_unused-fed71ab33e5b7842f94c1b5af139b45338c362fc.tar.gz
sssd_unused-fed71ab33e5b7842f94c1b5af139b45338c362fc.tar.xz
sssd_unused-fed71ab33e5b7842f94c1b5af139b45338c362fc.zip
Removed setprogname() and changed sudo_plugin_dir macro
Diffstat (limited to 'src')
-rw-r--r--src/conf_macros.m42
-rw-r--r--src/sss_client/sudo_plugin/sss_sudoplugin.c23
2 files changed, 12 insertions, 13 deletions
diff --git a/src/conf_macros.m4 b/src/conf_macros.m4
index b626c89f..fb75cbbb 100644
--- a/src/conf_macros.m4
+++ b/src/conf_macros.m4
@@ -39,7 +39,7 @@ AC_DEFUN([WITH_SUDO_PLUGIN_PATH],
)
]
)
- sudo_pluginpath="${libdir}/sudo"
+ sudo_pluginpath="/usr/lib/sudo"
sudo_config_pluginpath="\"LIBDIR\"/sudo"
if test x"$with_sudo_plugin_path" != x; then
sudo_pluginpath=$with_sudo_plugin_path
diff --git a/src/sss_client/sudo_plugin/sss_sudoplugin.c b/src/sss_client/sudo_plugin/sss_sudoplugin.c
index 021ee8c9..90803e4c 100644
--- a/src/sss_client/sudo_plugin/sss_sudoplugin.c
+++ b/src/sss_client/sudo_plugin/sss_sudoplugin.c
@@ -38,7 +38,7 @@
# The plugin_name corresponds to a global symbol in the plugin
# that contains the plugin interface structure.
#
- Plugin sss_sudo_policy libsss_sudoplugin.so
+ Plugin sss_sudo_policy /usr/lib/sudo/libsss_sudoplugin.so
*/
@@ -163,9 +163,9 @@ static int debug_level;
static struct user_info_struct
{
-char *username;
-int lines;
-int cols;
+ char *username;
+ int lines;
+ int cols;
}user_information;
@@ -408,15 +408,14 @@ static int policy_open(unsigned int version,
/*
* To get thhe command name that sudo was run as, typically
- * "sudo" or "sudoedit".
+ * "sudo" or "sudoedit". setprogname() is only supported in BSD
+ * No need to include it now.
+ *
+ * else if (strncmp(*ui, "progname=", sizeof("progname=") - 1) == 0) {
+ * setprogname(*ui + sizeof("progname=") - 1);
+ * }
+ *
*/
-
-#if !defined(HAVE_GETPROGNAME) && !defined(HAVE___PROGNAME)
-
- else if (strncmp(*ui, "progname=", sizeof("progname=") - 1) == 0) {
- setprogname(*ui + sizeof("progname=") - 1);
- }
-#endif
/* Check to see if sudo was called as sudoedit or with -e flag. */