From df277d693484868d23eb4b56a1bb13051f92faab Mon Sep 17 00:00:00 2001
From: Lammert Bies <github@linocomm.net>
Date: Sat, 10 Dec 2016 10:49:32 +0100
Subject: [PATCH] Moved set_uid_option to own file

---
 Makefile                     |  1 +
 src/httplib_set_uid_option.c | 64 ++++++++++++++++++++++++++++++++++++
 src/libhttp.c                | 29 ----------------
 3 files changed, 65 insertions(+), 29 deletions(-)
 create mode 100644 src/httplib_set_uid_option.c

diff --git a/Makefile b/Makefile
index 62a6520a..1dae6bfd 100644
--- a/Makefile
+++ b/Makefile
@@ -69,6 +69,7 @@ LIB_SOURCES =	src/libhttp.c					\
 		src/httplib_set_ssl_option.c			\
 		src/httplib_set_sock_timeout.c			\
 		src/httplib_set_tcp_nodelay.c			\
+		src/httplib_set_uid_option.c			\
 		src/httplib_ssl_error.c				\
 		src/httplib_ssl_get_client_cert_info.c		\
 		src/httplib_ssl_get_protocol.c			\
diff --git a/src/httplib_set_uid_option.c b/src/httplib_set_uid_option.c
new file mode 100644
index 00000000..06853e87
--- /dev/null
+++ b/src/httplib_set_uid_option.c
@@ -0,0 +1,64 @@
+/* 
+ * Copyright (C) 2016 Lammert Bies
+ * Copyright (c) 2013-2016 the Civetweb developers
+ * Copyright (c) 2004-2013 Sergey Lyubka
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+
+
+#include "libhttp-private.h"
+
+
+
+/*
+ * int XX_httplib_set_uid_option( struct mg_contect *ctx );
+ *
+ * The function XX_httplib_set_uid_option() runs on systems which support it
+ * the context in the security environment of a specific user.
+ */
+
+#if !defined(_WIN32)
+
+int XX_httplib_set_uid_option( struct mg_context *ctx ) {
+
+	struct passwd *pw;
+
+	if ( ctx != NULL ) {
+
+		const char *uid = ctx->config[RUN_AS_USER];
+		int success = 0;
+
+		if (uid == NULL) success = 1;
+		else {
+			if      ( (pw = getpwnam(uid)) == NULL ) mg_cry( XX_httplib_fc(ctx), "%s: unknown user [%s]", __func__, uid                  );
+			else if ( setgid(pw->pw_gid)   == -1   ) mg_cry( XX_httplib_fc(ctx), "%s: setgid(%s): %s",    __func__, uid, strerror(errno) );
+			else if ( setgroups(0, NULL)           ) mg_cry( XX_httplib_fc(ctx), "%s: setgroups(): %s",   __func__,      strerror(errno) );
+			else if ( setuid(pw->pw_uid)   == -1   ) mg_cry( XX_httplib_fc(ctx), "%s: setuid(%s): %s",    __func__, uid, strerror(errno) );
+			else success = 1;
+		}
+
+		return success;
+	}
+	return 0;
+
+}  /* XX_httplib_set_uid_option */
+
+#endif /* !_WIN32 */
diff --git a/src/libhttp.c b/src/libhttp.c
index 15af0b52..2e4dac4d 100644
--- a/src/libhttp.c
+++ b/src/libhttp.c
@@ -8328,32 +8328,3 @@ int XX_httplib_check_acl( struct mg_context *ctx, uint32_t remote_ip ) {
 	return -1;
 
 }  /* XX_httplib_check_acl */
-
-
-#if !defined(_WIN32)
-
-int XX_httplib_set_uid_option( struct mg_context *ctx ) {
-
-	struct passwd *pw;
-
-	if ( ctx != NULL ) {
-
-		const char *uid = ctx->config[RUN_AS_USER];
-		int success = 0;
-
-		if (uid == NULL) success = 1;
-		else {
-			if      ( (pw = getpwnam(uid)) == NULL ) mg_cry( XX_httplib_fc(ctx), "%s: unknown user [%s]", __func__, uid                  );
-			else if ( setgid(pw->pw_gid)   == -1   ) mg_cry( XX_httplib_fc(ctx), "%s: setgid(%s): %s",    __func__, uid, strerror(errno) );
-			else if ( setgroups(0, NULL)           ) mg_cry( XX_httplib_fc(ctx), "%s: setgroups(): %s",   __func__,      strerror(errno) );
-			else if ( setuid(pw->pw_uid)   == -1   ) mg_cry( XX_httplib_fc(ctx), "%s: setuid(%s): %s",    __func__, uid, strerror(errno) );
-			else success = 1;
-		}
-
-		return success;
-	}
-	return 0;
-
-}  /* XX_httplib_set_uid_option */
-
-#endif /* !_WIN32 */