aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiller Puckette <millerpuckette@users.sourceforge.net>2009-01-14 21:38:14 +0000
committerMiller Puckette <millerpuckette@users.sourceforge.net>2009-01-14 21:38:14 +0000
commit4dba8e06840efa789616e20b8eed52dd85f78ca0 (patch)
tree6b80bc500d7443fc1bdcd0b592359ea00bfe2be3
parent675912671a2a99080acf0a06a26005d1f887ccb6 (diff)
0.42-2 - setuid and find bug fixes
svn path=/trunk/; revision=10556
-rw-r--r--pd/src/m_binbuf.c2
-rw-r--r--pd/src/m_pd.h2
-rw-r--r--pd/src/s_inter.c12
3 files changed, 8 insertions, 8 deletions
diff --git a/pd/src/m_binbuf.c b/pd/src/m_binbuf.c
index a895bc67..05ef1888 100644
--- a/pd/src/m_binbuf.c
+++ b/pd/src/m_binbuf.c
@@ -1330,7 +1330,7 @@ int binbuf_match(t_binbuf *inbuf, t_binbuf *searchbuf, int wholeword)
}
else if (a1->a_type == A_SYMBOL || a1->a_type == A_DOLLSYM)
{
- if ((a2->a_type != A_SYMBOL && a2->a_type == A_DOLLSYM)
+ if ((a2->a_type != A_SYMBOL && a2->a_type != A_DOLLSYM)
|| (wholeword && a1->a_w.w_symbol != a2->a_w.w_symbol)
|| (!wholeword && !strstr(a1->a_w.w_symbol->s_name,
a2->a_w.w_symbol->s_name)))
diff --git a/pd/src/m_pd.h b/pd/src/m_pd.h
index 5162131e..9d8ffa13 100644
--- a/pd/src/m_pd.h
+++ b/pd/src/m_pd.h
@@ -10,7 +10,7 @@ extern "C" {
#define PD_MAJOR_VERSION 0
#define PD_MINOR_VERSION 42
-#define PD_BUGFIX_VERSION 2
+#define PD_BUGFIX_VERSION 3
#define PD_TEST_VERSION ""
/* old name for "MSW" flag -- we have to take it for the sake of many old
diff --git a/pd/src/s_inter.c b/pd/src/s_inter.c
index 8ed6f373..c67076f3 100644
--- a/pd/src/s_inter.c
+++ b/pd/src/s_inter.c
@@ -1097,7 +1097,7 @@ int sys_startgui(const char *guidir)
}
else if (!childpid) /* we're the child */
{
- seteuid(getuid()); /* lose setuid priveliges */
+ setuid(getuid()); /* lose setuid priveliges */
#ifndef __APPLE__
/* the wish process in Unix will make a wish shell and
read/write standard in and out unless we close the
@@ -1173,14 +1173,14 @@ int sys_startgui(const char *guidir)
if (pipe(pipe9) < 0)
{
- seteuid(getuid()); /* lose setuid priveliges */
+ setuid(getuid()); /* lose setuid priveliges */
sys_sockerror("pipe");
return (1);
}
watchpid = fork();
if (watchpid < 0)
{
- seteuid(getuid()); /* lose setuid priveliges */
+ setuid(getuid()); /* lose setuid priveliges */
if (errno)
perror("sys_startgui");
else fprintf(stderr, "sys_startgui failed\n");
@@ -1189,7 +1189,7 @@ int sys_startgui(const char *guidir)
else if (!watchpid) /* we're the child */
{
sys_set_priority(1);
- seteuid(getuid()); /* lose setuid priveliges */
+ setuid(getuid()); /* lose setuid priveliges */
if (pipe9[1] != 0)
{
dup2(pipe9[0], 0);
@@ -1206,7 +1206,7 @@ int sys_startgui(const char *guidir)
else /* we're the parent */
{
sys_set_priority(0);
- seteuid(getuid()); /* lose setuid priveliges */
+ setuid(getuid()); /* lose setuid priveliges */
close(pipe9[0]);
sys_watchfd = pipe9[1];
/* We also have to start the ping loop in the GUI;
@@ -1214,7 +1214,7 @@ int sys_startgui(const char *guidir)
}
}
- seteuid(getuid()); /* lose setuid priveliges */
+ setuid(getuid()); /* lose setuid priveliges */
#endif /* __linux__ */
#ifdef MSW