2 files changed, 88 insertions, 8 deletions

diff --git a/util-src/Makefile b/util-src/Makefile
index 06e72577..4058b59d 100644
--- a/util-src/Makefile
+++ b/util-src/Makefile
@@ -6,7 +6,8 @@ LUA_INCDIR?=/usr/include/lua$(LUA_SUFFIX)
 LUA_LIB?=lua$(LUA_SUFFIX)
 IDN_LIB?=idn
 OPENSSL_LIB?=crypto
-
+CC?=gcc
+LD?=gcc
 
 
 all: encodings.so hashes.so pposix.so
@@ -21,18 +22,18 @@ clean:
 	rm -f ../util/*.so
 
 encodings.o: encodings.c
-	gcc $(CFLAGS) -I$(LUA_INCDIR) -c -o encodings.o encodings.c
+	$(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o encodings.o encodings.c
 encodings.so: encodings.o
-	export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc $(LFLAGS) -o encodings.so encodings.o -L/usr/local/lib -llua$(LUA_SUFFIX) -lidn
+	export MACOSX_DEPLOYMENT_TARGET="10.3"; $(LD) $(LFLAGS) -o encodings.so encodings.o -L$(LUA_LIBDIR) -llua$(LUA_SUFFIX) -lidn
 	
 
 hashes.o: hashes.c
-	gcc $(CFLAGS) -I$(LUA_INCDIR) -c -o hashes.o hashes.c
+	$(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o hashes.o hashes.c
 hashes.so: hashes.o
-	export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc $(LFLAGS) -o hashes.so hashes.o -L/usr/local/lib -llua$(LUA_SUFFIX) -lcrypto
+	export MACOSX_DEPLOYMENT_TARGET="10.3"; $(LD) $(LFLAGS) -o hashes.so hashes.o -L$(LUA_LIBDIR) -llua$(LUA_SUFFIX) -lcrypto
 
 pposix.o: pposix.c
-	gcc $(CFLAGS) -I$(LUA_INCDIR) -c -o pposix.o pposix.c
+	$(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o pposix.o pposix.c
 pposix.so: pposix.o
-	export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc $(LFLAGS) -o pposix.so pposix.o -L/usr/local/lib -llua$(LUA_SUFFIX)
+	export MACOSX_DEPLOYMENT_TARGET="10.3"; $(LD) $(LFLAGS) -o pposix.so pposix.o -L$(LUA_LIBDIR) -llua$(LUA_SUFFIX)
 	
diff --git a/util-src/pposix.c b/util-src/pposix.c
index efb777b7..075c9c8e 100644
--- a/util-src/pposix.c
+++ b/util-src/pposix.c
@@ -22,9 +22,10 @@
 #include <fcntl.h>
 
 #include <syslog.h>
+#include <pwd.h>
 
 #include <string.h>
-
+#include <errno.h>
 #include "lua.h"
 #include "lauxlib.h"
 
@@ -216,6 +217,78 @@ int lc_getpid(lua_State* L)
 	return 1;
 }
 
+/* UID/GID functions */
+
+int lc_getuid(lua_State* L)
+{
+	lua_pushinteger(L, getuid());
+	return 1;
+}
+
+int lc_getgid(lua_State* L)
+{
+	lua_pushinteger(L, getgid());
+	return 1;
+}
+
+int lc_setuid(lua_State* L)
+{
+	int uid = -1;
+	if(lua_gettop(L) < 1)
+		return 0;
+	if(!lua_isnumber(L, 1) && lua_tostring(L, 1))
+	{
+		/* Passed UID is actually a string, so look up the UID */
+		struct passwd *p;
+		p = getpwnam(lua_tostring(L, 1));
+		if(!p)
+		{
+			lua_pushboolean(L, 0);
+			lua_pushstring(L, "no-such-user");
+			return 2;
+		}
+		uid = p->pw_uid;
+	}
+	else
+	{
+		uid = lua_tonumber(L, 1);
+	}
+	
+	if(uid>-1)
+	{
+		/* Ok, attempt setuid */
+		errno = 0;
+		if(setuid(uid))
+		{
+			/* Fail */
+			lua_pushboolean(L, 0);
+			switch(errno)
+			{
+			case EINVAL:
+				lua_pushstring(L, "invalid-uid");
+				break;
+			case EPERM:
+				lua_pushstring(L, "permission-denied");
+				break;
+			default:
+				lua_pushstring(L, "unknown-error");
+			}
+			return 2;
+		}
+		else
+		{
+			/* Success! */
+			lua_pushboolean(L, 1);
+			return 1;
+		}
+	}
+	
+	/* Seems we couldn't find a valid UID to switch to */
+	lua_pushboolean(L, 0);
+	lua_pushstring(L, "invalid-uid");
+	return 2;
+}
+
 /* Register functions */
 
 int luaopen_util_pposix(lua_State *L)
@@ -240,6 +313,12 @@ int luaopen_util_pposix(lua_State *L)
 	lua_pushcfunction(L, lc_getpid);
 	lua_setfield(L, -2, "getpid");
 
+	lua_pushcfunction(L, lc_getuid);
+	lua_setfield(L, -2, "getuid");
+
+	lua_pushcfunction(L, lc_setuid);
+	lua_setfield(L, -2, "setuid");
+
 	lua_pushliteral(L, "pposix");
 	lua_setfield(L, -2, "_NAME");