From de1ec079c58e6278a24dc1a84a08510e5ee7e45f Mon Sep 17 00:00:00 2001
From: Timo Sirainen <tss@iki.fi>
Date: Tue, 4 Mar 2003 06:00:13 +0200
Subject: [PATCH] Removed restrict_access_clean_env() and env_remove(). They're
 not needed.

--HG--
branch : HEAD
---
 src/lib/env-util.c        | 20 --------------------
 src/lib/env-util.h        |  2 --
 src/lib/restrict-access.c |  8 --------
 src/lib/restrict-access.h |  3 ---
 4 files changed, 33 deletions(-)

diff --git a/src/lib/env-util.c b/src/lib/env-util.c
index 0d6fc074d3..4f1b9d78c7 100644
--- a/src/lib/env-util.c
+++ b/src/lib/env-util.c
@@ -39,26 +39,6 @@ void env_put(const char *env)
 		i_fatal("Environment full, can't add: %s", env);
 }
 
-void env_remove(const char *env)
-{
-	extern char **environ;
-	size_t len;
-
-	if (environ == NULL)
-		return;
-
-	len = strlen(env);
-	for (; *environ != NULL; environ++) {
-		if (strncmp(*environ, env, len) == 0 &&
-		    (*environ)[len] == '=') {
-			char **p;
-
-			for (p = environ; *p != NULL; p++)
-				p[0] = p[1];
-		}
-	}
-}
-
 void env_clean(void)
 {
 	extern char **environ;
diff --git a/src/lib/env-util.h b/src/lib/env-util.h
index d180ed2069..18562c3946 100644
--- a/src/lib/env-util.h
+++ b/src/lib/env-util.h
@@ -4,8 +4,6 @@
 /* Add new environment variable. Wrapper to putenv(). Note that calls to this
    function allocates memory which isn't free'd until env_clean() is called. */
 void env_put(const char *env);
-/* Remove environment variable. */
-void env_remove(const char *env);
 /* Clear all environment variables. */
 void env_clean(void);
 
diff --git a/src/lib/restrict-access.c b/src/lib/restrict-access.c
index bb53237d0f..27e209976f 100644
--- a/src/lib/restrict-access.c
+++ b/src/lib/restrict-access.c
@@ -42,14 +42,6 @@ void restrict_access_set_env(const char *user, uid_t uid, gid_t gid,
 	env_put(t_strdup_printf("RESTRICT_SETGID=%s", dec2str(gid)));
 }
 
-void restrict_access_clear_env(void)
-{
-	env_remove("RESTRICT_USER");
-	env_remove("RESTRICT_CHROOT");
-	env_remove("RESTRICT_SETUID");
-	env_remove("RESTRICT_SETGID");
-}
-
 void restrict_access_by_env(int disallow_root)
 {
 	const char *env;
diff --git a/src/lib/restrict-access.h b/src/lib/restrict-access.h
index 23ebbb51c4..78f8039790 100644
--- a/src/lib/restrict-access.h
+++ b/src/lib/restrict-access.h
@@ -6,9 +6,6 @@
 void restrict_access_set_env(const char *user, uid_t uid, gid_t gid,
 			     const char *chroot_dir);
 
-/* clear the environment variables set by restrict_access_set_env() */
-void restrict_access_clear_env(void);
-
 /* chroot, setuid() and setgid() based on environment variables.
    If disallow_roots is TRUE, we'll kill ourself if we didn't have the
    environment settings and we have root uid or gid. */
-- 
2.47.3