summaryrefslogtreecommitdiff
path: root/package/sudo/patches/patch-plugins_sudoers_match_c
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbrodkorb@conet.de>2014-12-15 13:47:03 +0100
committerWaldemar Brodkorb <wbrodkorb@conet.de>2014-12-15 13:47:03 +0100
commit7086619ca8d75d2d2d42abe58b2893c52e3838f2 (patch)
treeb605f668714a26d5b9f4b79d05bacf97df8f93ec /package/sudo/patches/patch-plugins_sudoers_match_c
parente84ec4eea8783147c9b954adc608cd7893513b7b (diff)
update sudo, fix packaging issues. disable plugins
Diffstat (limited to 'package/sudo/patches/patch-plugins_sudoers_match_c')
-rw-r--r--package/sudo/patches/patch-plugins_sudoers_match_c14
1 files changed, 7 insertions, 7 deletions
diff --git a/package/sudo/patches/patch-plugins_sudoers_match_c b/package/sudo/patches/patch-plugins_sudoers_match_c
index 57c49e55b..88fe5986c 100644
--- a/package/sudo/patches/patch-plugins_sudoers_match_c
+++ b/package/sudo/patches/patch-plugins_sudoers_match_c
@@ -1,6 +1,6 @@
---- sudo-1.8.10.orig/plugins/sudoers/match.c 2014-03-07 22:51:19.000000000 +0100
-+++ sudo-1.8.10/plugins/sudoers/match.c 2014-03-24 16:16:24.000000000 +0100
-@@ -122,10 +122,12 @@ userlist_matches(const struct passwd *pw
+--- sudo-1.8.11p2.orig/plugins/sudoers/match.c 2014-09-23 18:56:04.000000000 +0200
++++ sudo-1.8.11p2/plugins/sudoers/match.c 2014-12-15 10:26:02.230233008 +0100
+@@ -126,10 +126,12 @@ userlist_matches(const struct passwd *pw
case ALL:
matched = !m->negated;
break;
@@ -13,7 +13,7 @@
case USERGROUP:
if (usergr_matches(m->name, pw->pw_name, pw))
matched = !m->negated;
-@@ -178,10 +180,12 @@ runaslist_matches(const struct member_li
+@@ -182,10 +184,12 @@ runaslist_matches(const struct member_li
case ALL:
user_matched = !m->negated;
break;
@@ -26,7 +26,7 @@
case USERGROUP:
if (usergr_matches(m->name, runas_pw->pw_name, runas_pw))
user_matched = !m->negated;
-@@ -278,10 +282,12 @@ hostlist_matches(const struct member_lis
+@@ -282,10 +286,12 @@ hostlist_matches(const struct member_lis
case ALL:
matched = !m->negated;
break;
@@ -39,7 +39,7 @@
case NTWKADDR:
if (addr_matches(m->name))
matched = !m->negated;
-@@ -930,6 +936,7 @@ sudo_getdomainname(void)
+@@ -939,6 +945,7 @@ sudo_getdomainname(void)
* else return false. Either of "lhost", "shost" or "user" may be NULL
* in which case that argument is not checked...
*/
@@ -47,7 +47,7 @@
bool
netgr_matches(const char *netgr, const char *lhost, const char *shost, const char *user)
{
-@@ -972,3 +979,4 @@ netgr_matches(const char *netgr, const c
+@@ -981,3 +988,4 @@ netgr_matches(const char *netgr, const c
debug_return_bool(rc);
}