X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=config%2Famanda%2Fuserid.m4;h=adb2ff01864b97a8ff83e154541dc77a0bd0a80c;hb=b116e9366c7b2ea2c2eb53b0a13df4090e176235;hp=c659395a51e9fb88516d918dee89fa93290e00c4;hpb=2627875b7d18858bc1f9f7652811e4d8c15a23eb;p=debian%2Famanda

diff --git a/config/amanda/userid.m4 b/config/amanda/userid.m4
index c659395..adb2ff0 100644
--- a/config/amanda/userid.m4
+++ b/config/amanda/userid.m4
@@ -29,7 +29,7 @@ AC_DEFUN([AMANDA_DISABLE_INSTALLPERMS],
 #
 #   Handle the --without-force-id option, which disables userid checks for
 #   all Amanda applications.  Defines and substitutes CHECK_USERID *unless* 
-#   this option is given.
+#   this option is given, and also sets AM_CONDITIONAL CHECK_USERID
 #
 AC_DEFUN([AMANDA_WITH_FORCE_UID],
 [
@@ -52,6 +52,7 @@ AC_DEFUN([AMANDA_WITH_FORCE_UID],
             AC_MSG_ERROR([*** You must not supply an argument to --with-force-uid option.])
     esac
     AC_SUBST(CHECK_USERID)
+    AM_CONDITIONAL(CHECK_USERID, test x"$CHECK_USERID" = x"1")
 ])
 
 # SYNOPSIS
@@ -112,7 +113,7 @@ AC_DEFUN([AMANDA_WITH_GROUP],
             esac
         ], [
             AMANDA_MSG_WARN([[no group specified (--with-group) -- using 'backup']])
-	    CLIENT_LOGIN=backup
+	    SETUID_GROUP=backup
         ]
     )
     AC_SUBST(SETUID_GROUP)
@@ -170,7 +171,7 @@ AC_DEFUN([AMANDA_WITH_SINGLE_USERID],
             [force amanda to run as a single userid (for testing)]),
         [   SINGLE_USERID=$withval ])
 
-    case "$target" in
+    case "$host" in
         *-pc-cygwin)
             WANT_SETUID_CLIENT=false
 	    SINGLE_USERID=yes