Attachment 39553 Details for Bug 91569

[patch] sudo.diff

sudo.diff (text/plain), 5.15 KB, created by Thomas Biege on 2005-06-21 07:04:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Biege

Created: 2005-06-21 07:04:47 UTC

Size: 5.15 KB

patch

obsolete

>diff -urNp sudo-1.6.8p8/ldap.c sudo-1.6.8p9/ldap.c
>--- sudo-1.6.8p8/ldap.c	2004-11-30 22:28:46.000000000 -0500
>+++ sudo-1.6.8p9/ldap.c	2005-06-19 16:31:51.000000000 -0500
>@@ -278,8 +278,6 @@ int sudo_ldap_check_command(ld,entry)
>     /* Match against ALL ? */
>     if (!strcasecmp(*p,"ALL")) {
>       ret=1;
>-      if (safe_cmnd) free (safe_cmnd);
>-      safe_cmnd=estrdup(user_cmnd);
>       if (ldap_conf.debug>1) printf(" MATCH!\n");
>       continue;
>     }
>diff -urNp sudo-1.6.8p8/parse.yacc sudo-1.6.8p9/parse.yacc
>--- sudo-1.6.8p8/parse.yacc	2004-08-11 13:29:10.000000000 -0500
>+++ sudo-1.6.8p9/parse.yacc	2005-06-19 13:24:32.000000000 -0500
>@@ -676,10 +676,6 @@ cmnd		:	ALL {
> 			    }
> 
> 			    $$ = TRUE;
>-
>-			    if (safe_cmnd)
>-				free(safe_cmnd);
>-			    safe_cmnd = estrdup(user_cmnd);
> 			}
> 		|	ALIAS {
> 			    aliasinfo *aip;
>diff -urNp sudo-1.6.8p8/sudo.c sudo-1.6.8p9/sudo.c
>--- sudo-1.6.8p8/sudo.c	2005-03-24 20:56:41.000000000 -0500
>+++ sudo-1.6.8p9/sudo.c	2005-06-19 15:35:46.000000000 -0500
>@@ -275,6 +275,8 @@ main(argc, argv, envp)
> 	/* Validate the user but don't search for pseudo-commands. */
> 	validated = sudoers_lookup(pwflag);
>     }
>+    if (safe_cmnd == NULL)
>+	safe_cmnd = user_cmnd;
> 
>     /*
>      * If we are using set_perms_posix() and the stay_setuid flag was not set,
>@@ -391,14 +393,6 @@ main(argc, argv, envp)
> 	    exit(0);
> 	}
> 
>-	/* This *must* have been set if we got a match but... */
>-	if (safe_cmnd == NULL) {
>-	    log_error(MSG_ONLY,
>-		"internal error, safe_cmnd never got set for %s; %s",
>-		user_cmnd,
>-		"please report this error at http://courtesan.com/sudo/bugs/");
>-	}
>-
> 	/* Override user's umask if configured to do so. */
> 	if (def_umask != 0777)
> 	    (void) umask(def_umask);
>diff -urNp sudo-1.6.8p8/sudo.tab.c sudo-1.6.8p9/sudo.tab.c
>--- sudo-1.6.8p8/sudo.tab.c	2004-08-11 13:29:36.000000000 -0500
>+++ sudo-1.6.8p9/sudo.tab.c	2005-06-19 15:07:26.000000000 -0500
>@@ -674,7 +674,7 @@ short *yyss;
> short *yysslim;
> YYSTYPE *yyvs;
> int yystacksize;
>-#line 890 "parse.yacc"
>+#line 886 "parse.yacc"
> 
> #define MOREALIASES (32)
> aliasinfo *aliases = NULL;
>@@ -1740,14 +1740,10 @@ case 60:
> 			    }
> 
> 			    yyval.BOOLEAN = TRUE;
>-
>-			    if (safe_cmnd)
>-				free(safe_cmnd);
>-			    safe_cmnd = estrdup(user_cmnd);
> 			}
> break;
> case 61:
>-#line 684 "parse.yacc"
>+#line 680 "parse.yacc"
> {
> 			    aliasinfo *aip;
> 
>@@ -1779,7 +1775,7 @@ case 61:
> 			}
> break;
> case 62:
>-#line 713 "parse.yacc"
>+#line 709 "parse.yacc"
> {
> 			    if (printmatches == TRUE) {
> 				if (in_alias == TRUE) {
>@@ -1807,11 +1803,11 @@ case 62:
> 			}
> break;
> case 65:
>-#line 744 "parse.yacc"
>+#line 740 "parse.yacc"
> { push; }
> break;
> case 66:
>-#line 744 "parse.yacc"
>+#line 740 "parse.yacc"
> {
> 			    if ((MATCHED(host_matches) || pedantic) &&
> 				!add_alias(yyvsp[-3].string, HOST_ALIAS, host_matches)) {
>@@ -1822,7 +1818,7 @@ case 66:
> 			}
> break;
> case 71:
>-#line 762 "parse.yacc"
>+#line 758 "parse.yacc"
> {
> 			    push;
> 			    if (printmatches == TRUE) {
>@@ -1835,7 +1831,7 @@ case 71:
> 			}
> break;
> case 72:
>-#line 771 "parse.yacc"
>+#line 767 "parse.yacc"
> {
> 			    if ((MATCHED(cmnd_matches) || pedantic) &&
> 				!add_alias(yyvsp[-3].string, CMND_ALIAS, cmnd_matches)) {
>@@ -1850,11 +1846,11 @@ case 72:
> 			}
> break;
> case 73:
>-#line 785 "parse.yacc"
>+#line 781 "parse.yacc"
> { ; }
> break;
> case 77:
>-#line 793 "parse.yacc"
>+#line 789 "parse.yacc"
> {
> 			    if (printmatches == TRUE) {
> 				in_alias = TRUE;
>@@ -1866,7 +1862,7 @@ case 77:
> 			}
> break;
> case 78:
>-#line 801 "parse.yacc"
>+#line 797 "parse.yacc"
> {
> 			    if ((yyvsp[0].BOOLEAN != NOMATCH || pedantic) &&
> 				!add_alias(yyvsp[-3].string, RUNAS_ALIAS, yyvsp[0].BOOLEAN)) {
>@@ -1880,11 +1876,11 @@ case 78:
> 			}
> break;
> case 81:
>-#line 818 "parse.yacc"
>+#line 814 "parse.yacc"
> { push; }
> break;
> case 82:
>-#line 818 "parse.yacc"
>+#line 814 "parse.yacc"
> {
> 			    if ((MATCHED(user_matches) || pedantic) &&
> 				!add_alias(yyvsp[-3].string, USER_ALIAS, user_matches)) {
>@@ -1896,19 +1892,19 @@ case 82:
> 			}
> break;
> case 85:
>-#line 833 "parse.yacc"
>+#line 829 "parse.yacc"
> {
> 			    SETMATCH(user_matches, yyvsp[0].BOOLEAN);
> 			}
> break;
> case 86:
>-#line 836 "parse.yacc"
>+#line 832 "parse.yacc"
> {
> 			    SETNMATCH(user_matches, yyvsp[0].BOOLEAN);
> 			}
> break;
> case 87:
>-#line 841 "parse.yacc"
>+#line 837 "parse.yacc"
> {
> 			    if (userpw_matches(yyvsp[0].string, user_name, sudo_user.pw))
> 				yyval.BOOLEAN = TRUE;
>@@ -1918,7 +1914,7 @@ case 87:
> 			}
> break;
> case 88:
>-#line 848 "parse.yacc"
>+#line 844 "parse.yacc"
> {
> 			    if (usergr_matches(yyvsp[0].string, user_name, sudo_user.pw))
> 				yyval.BOOLEAN = TRUE;
>@@ -1928,7 +1924,7 @@ case 88:
> 			}
> break;
> case 89:
>-#line 855 "parse.yacc"
>+#line 851 "parse.yacc"
> {
> 			    if (netgr_matches(yyvsp[0].string, NULL, NULL, user_name))
> 				yyval.BOOLEAN = TRUE;
>@@ -1938,7 +1934,7 @@ case 89:
> 			}
> break;
> case 90:
>-#line 862 "parse.yacc"
>+#line 858 "parse.yacc"
> {
> 			    aliasinfo *aip = find_alias(yyvsp[0].string, USER_ALIAS);
> 
>@@ -1963,12 +1959,12 @@ case 90:
> 			}
> break;
> case 91:
>-#line 884 "parse.yacc"
>+#line 880 "parse.yacc"
> {
> 			    yyval.BOOLEAN = TRUE;
> 			}
> break;
>-#line 1920 "sudo.tab.c"
>+#line 1916 "sudo.tab.c"
>     }
>     yyssp -= yym;
>     yystate = *yyssp;

Actions: View | Diff

Attachments on bug 91569: 39552 | 39553