From 464b5c4aa5ddb4e7a021713f84e1347a30a95f54 Mon Sep 17 00:00:00 2001
From: MggMuggins <mggmugginsmc@gmail.com>
Date: Mon, 27 Nov 2017 17:53:11 -0600
Subject: [PATCH] Small fixes to better mesh with redox_users changes

---
 src/bin/groupadd.rs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/bin/groupadd.rs b/src/bin/groupadd.rs
index 1edac7f625..252f6c9862 100644
--- a/src/bin/groupadd.rs
+++ b/src/bin/groupadd.rs
@@ -11,7 +11,7 @@ use std::io::Write;
 use std::process::exit;
 
 use arg_parser::ArgParser;
-use redox_users::{add_group, get_uid, get_unique_group_id};
+use redox_users::{add_group, get_unique_group_id};
 
 const MAN_PAGE: &'static str = /* @MANSTART{groupadd} */ r#"
 NAME
@@ -56,11 +56,6 @@ fn main() {
         exit(0);
     }
     
-    if get_uid() != 0 {
-        eprintln!("groupadd: privelege elevation required");
-        exit(1);
-    }
-    
     let groupname = if parser.args.is_empty() {
         eprintln!("groupadd: no group name specified");
         exit(1);
@@ -79,8 +74,9 @@ fn main() {
     match add_group(groupname, gid, &[""]) {
         Ok(_) => {},
         Err(err) => {
-            eprintln!("groupadd: {}: {}", err, groupname);
-            if parser.found("force") {
+            eprintln!("groupadd: {}: group {}", err, groupname);
+            let msg = format!("{}", err);
+            if parser.found("force") && msg == "user already exists" {
                 exit(0);
             } else {
                 exit(1);