mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-09-01 06:45:10 +00:00
Code Issues Releases Wiki Activity

Merge 5177a284b9ff 549f8f7c2463 88f3181692fe from 1.7 branch.

Browse Source
This commit is contained in:
Todd C. Miller
2010-03-22 10:19:07 -04:00
parent 617fb0e31a c2905815e6
commit 8df6ba9fee
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@@ -25195,9 +25195,9 @@ if test ${with_ldap-'no'} != "no"; then
CPPFLAGS="${CPPFLAGS} -I${with_ldap}/include" CPPFLAGS="${CPPFLAGS} -I${with_ldap}/include"
with_ldap=yes with_ldap=yes
LDAP=""
fi fi
SUDOERS_OBJS="${SUDOERS_OBJS} ldap.lo" SUDOERS_OBJS="${SUDOERS_OBJS} ldap.lo"
LDAP=""
{ echo "$as_me:$LINENO: checking for LDAP libraries" >&5 { echo "$as_me:$LINENO: checking for LDAP libraries" >&5
echo $ECHO_N "checking for LDAP libraries... $ECHO_C" >&6; } echo $ECHO_N "checking for LDAP libraries... $ECHO_C" >&6; }

2
configure.in
View File

@@ -2535,9 +2535,9 @@ if test ${with_ldap-'no'} != "no"; then
SUDO_APPEND_LIBPATH(LDFLAGS, [${with_ldap}/lib]) SUDO_APPEND_LIBPATH(LDFLAGS, [${with_ldap}/lib])
CPPFLAGS="${CPPFLAGS} -I${with_ldap}/include" CPPFLAGS="${CPPFLAGS} -I${with_ldap}/include"
with_ldap=yes with_ldap=yes
LDAP=""
fi fi
SUDOERS_OBJS="${SUDOERS_OBJS} ldap.lo" SUDOERS_OBJS="${SUDOERS_OBJS} ldap.lo"
LDAP=""
AC_MSG_CHECKING([for LDAP libraries]) AC_MSG_CHECKING([for LDAP libraries])
LDAP_LIBS="" LDAP_LIBS=""

4
plugins/sudoers/match.c
View File

@@ -375,7 +375,7 @@ command_matches(sudoers_cmnd, sudoers_args)
char *sudoers_args; char *sudoers_args;
{ {
/* Check for pseudo-commands */ /* Check for pseudo-commands */
if (strchr(user_cmnd, '/') == NULL) { if (sudoers_cmnd[0] != '/') {
/* /*
* Return true if both sudoers_cmnd and user_cmnd are "sudoedit" AND * Return true if both sudoers_cmnd and user_cmnd are "sudoedit" AND
* a) there are no args in sudoers OR * a) there are no args in sudoers OR
@@ -465,7 +465,7 @@ command_matches_glob(sudoers_cmnd, sudoers_args)
* else return false. * else return false.
*/ */
#define GLOB_FLAGS (GLOB_NOSORT | GLOB_MARK | GLOB_BRACE | GLOB_TILDE) #define GLOB_FLAGS (GLOB_NOSORT | GLOB_MARK | GLOB_BRACE | GLOB_TILDE)
if (glob(sudoers_cmnd, GLOB_FLAGS, NULL, &gl) != 0) { if (glob(sudoers_cmnd, GLOB_FLAGS, NULL, &gl) != 0 || gl.gl_pathc == 0) {
globfree(&gl); globfree(&gl);
return(FALSE); return(FALSE);
} }