From: Robert Luberda <robert@debian.org>
Date: Tue, 5 Jun 2018 00:21:33 +0200
Subject: Fix more gcc warnings

---
 configure.in | 5 ++---
 super.c      | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/configure.in b/configure.in
index 3c4ada9..eb9b688 100644
--- a/configure.in
+++ b/configure.in
@@ -38,14 +38,13 @@ if test "$Uname" = HP-UX ; then
     AC_DEFINE_UNQUOTED(HPUX_MINOR,$Minor)
 
 elif test "$Uname" = Linux ; then
-    AC_DEFINE(_BSD_SOURCE)
     AC_DEFINE(_DEFAULT_SOURCE)
 
 elif test "$Uname" = GNU/kFreeBSD ; then
-    AC_DEFINE(_BSD_SOURCE)
+    AC_DEFINE(_DEFAULT_SOURCE)
 
 elif test "$Uname" = GNU ; then  # Hurd
-    AC_DEFINE(_BSD_SOURCE)
+    AC_DEFINE(_DEFAULT_SOURCE)
 
 elif test "$Uname" = OSF1 ; then
     AC_DEFINE(_OSF_SOURCE)
diff --git a/super.c b/super.c
index 5f4c902..5a14fe4 100644
--- a/super.c
+++ b/super.c
@@ -662,9 +662,8 @@ char **o_file, **r_path;
 		l = findgid(1, localinfo.group);
 		if (l == -1)
 		    return Error(0,0,"Invalid gid specified after option -G\n");
-		else
-		    userinfo.orig_gid = l;
-		    userinfo.caller.pw_gid = l;
+		userinfo.orig_gid = l;
+		userinfo.caller.pw_gid = l;
 		break;
 	    case 'M':
 		it_came_from_cmdline = 1;