X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fvsh.c;h=084e1ccb254b9aac913157b1ac1c68280a1ed62a;hb=2765e7aa3e603972b38fa763d0cd3f398443f79d;hp=a834f2b170cf537f9e58ff5738857f0f4793b655;hpb=e051f492b3d0b27ea6062972361ddc4d6d1ee69d;p=util-vserver.git

diff --git a/src/vsh.c b/src/vsh.c
index a834f2b..084e1cc 100644
--- a/src/vsh.c
+++ b/src/vsh.c
@@ -179,6 +179,10 @@ static int sandbox_chroot(uid_t uid)
 	return 0;
 }
 
+#ifndef CAP_CONTEXT
+#  define CAP_CONTEXT	29
+#endif
+
 static struct {
 	const char *option;
 	int bit;
@@ -218,9 +222,7 @@ static struct {
 	{"CAP_SYS_RESOURCE",CAP_SYS_RESOURCE},
 	{"CAP_SYS_TIME",	CAP_SYS_TIME},
 	{"CAP_MKNOD",		CAP_MKNOD},
-#ifdef CAP_QUOTACTL
-	{"CAP_QUOTACTL",        CAP_QUOTACTL},
-#endif
+	{"CAP_CONTEXT",		CAP_CONTEXT},
 	{NULL,0}
 };
 
@@ -234,6 +236,7 @@ static unsigned get_remove_cap(char *name) {
 
 	remove_cap = /* NOTE: keep in sync with chcontext.c */
 		(1<<CAP_LINUX_IMMUTABLE)|
+		(1<<CAP_NET_BIND_SERVICE)|
 		(1<<CAP_NET_BROADCAST)|
 		(1<<CAP_NET_ADMIN)|
 		(1<<CAP_NET_RAW)|
@@ -248,12 +251,7 @@ static unsigned get_remove_cap(char *name) {
 		(1<<CAP_SYS_RESOURCE)|
 		(1<<CAP_SYS_TIME)|
 		(1<<CAP_MKNOD)|
-#ifdef CAP_QUOTACTL
-		(1<<CAP_QUOTACTL)|
-#endif
-#ifdef CAP_CONTEXT
 		(1<<CAP_CONTEXT)|
-#endif
 		0
 		;
 
@@ -396,12 +394,28 @@ static int sandbox_processes(uid_t uid, unsigned remove_cap)
 
 void runas_slice_user(char *username)
 {
-	struct passwd *pwd;
+	struct passwd pwdd, *pwd = &pwdd, *result;
+	char          *pwdBuffer;
 	char          *home_env, *logname_env, *mail_env, *shell_env, *user_env;
 	int           home_len, logname_len, mail_len, shell_len, user_len;
+	long          pwdBuffer_len;
 	static char   *envp[10];
 
-	if ((pwd = getpwnam(username)) == NULL) {
+
+	pwdBuffer_len = sysconf(_SC_GETPW_R_SIZE_MAX);
+	if (pwdBuffer_len == -1) {
+		perror("vserver: _SC_GETPW_R_SIZE_MAX not defined ");
+		exit(1);
+	}
+
+	pwdBuffer = (char*)malloc(pwdBuffer_len);
+	if (pwdBuffer == NULL) {
+		perror("vserver: malloc error ");
+		exit(1);
+	}
+
+	errno = 0;
+	if ((getpwnam_r(username,pwd,pwdBuffer,pwdBuffer_len, &result) != 0) || (errno != 0)) {
 		perror("vserver: getpwnam error ");
 		exit(1);
 	}
@@ -472,16 +486,30 @@ void runas_slice_user(char *username)
 	}
 }
 
-
-
 void slice_enter(char *context)
 {
-	struct passwd   *pwd;
+	struct passwd pwdd, *pwd = &pwdd, *result;
+	char          *pwdBuffer;
+	long          pwdBuffer_len;
 	unsigned remove_cap;
 	uid_t uid;
 
-	if ((pwd = getpwnam(context)) == NULL) {
+	pwdBuffer_len = sysconf(_SC_GETPW_R_SIZE_MAX);
+	if (pwdBuffer_len == -1) {
+		perror("vserver: _SC_GETPW_R_SIZE_MAX not defined ");
+		exit(1);
+	}
+
+	pwdBuffer = (char*)malloc(pwdBuffer_len);
+	if (pwdBuffer == NULL) {
+		perror("vserver: malloc error ");
+		exit(1);
+	}
+
+	errno = 0;
+	if ((getpwnam_r(context,pwd,pwdBuffer,pwdBuffer_len, &result) != 0) || (errno != 0)) {
 		fprintf(stderr,"vserver: getpwname(%s) failed",context);
+		perror("");
 		exit(2);
 	}
 
@@ -523,15 +551,13 @@ enum
   EXIT_ENOENT = 127
 };
 
-extern void slice_enter(char *);
-extern void runas_slice_user(char *);
-
 int main(int argc, char **argv)
 {
-    char *context, *username, *shell;
-    struct passwd   *pwd;
+    struct passwd   pwdd, *pwd = &pwdd, *result;
+    char            *context, *username, *shell, *pwdBuffer;
+    long            pwdBuffer_len;
     uid_t           uid;
-    int index, i;
+    int             index, i;
 
     if (argv[0][0]=='-') 
       index = 1;
@@ -563,7 +589,20 @@ int main(int argc, char **argv)
     /* With the uid/gid appropriately set. Let's figure out what the
      * shell in the vserver's /etc/passwd is for the given username.
      */
-    if ((pwd = getpwnam(username)) == NULL) {
+
+    pwdBuffer_len = sysconf(_SC_GETPW_R_SIZE_MAX);
+    if (pwdBuffer_len == -1) {
+	    perror("vserver: _SC_GETPW_R_SIZE_MAX not defined ");
+	    exit(1);
+    }
+    pwdBuffer = (char*)malloc(pwdBuffer_len);
+    if (pwdBuffer == NULL) {
+	    perror("vserver: malloc error ");
+	    exit(1);
+    }
+
+    errno = 0;
+    if ((getpwnam_r(username,pwd,pwdBuffer,pwdBuffer_len, &result) != 0) || (errno != 0)) {
         fprintf(stderr,"vsh: getpwnam error failed for %s\n",username); 
         exit(1);
     }