[svn-commits] pabelanger: branch pabelanger/non-root r275854 - in /team/pabelanger/non-root...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Mon Jul 12 21:57:53 CDT 2010
Author: pabelanger
Date: Mon Jul 12 21:57:49 2010
New Revision: 275854
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=275854
Log:
Rework checking for 'Asterisk' user and group within /etc/passwd.
Modified:
team/pabelanger/non-root/configure
team/pabelanger/non-root/configure.ac
team/pabelanger/non-root/include/asterisk/autoconfig.h.in
Modified: team/pabelanger/non-root/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/non-root/configure.ac?view=diff&rev=275854&r1=275853&r2=275854
==============================================================================
--- team/pabelanger/non-root/configure.ac (original)
+++ team/pabelanger/non-root/configure.ac Mon Jul 12 21:57:49 2010
@@ -499,7 +499,7 @@
AC_ARG_ENABLE([non-root],
[AS_HELP_STRING([--disable-non-root],
- [Explicity disable non-root installation])],
+ [Explicitly disable non-root installation])],
[case "${enableval}" in
y|ye|yes) disable_nonroot=no ;;
n|no) disable_nonroot=yes ;;
@@ -509,37 +509,37 @@
dnl Check for asterisk in /etc/passwd
if test "${disable_nonroot}" != "yes" ; then
dnl parse /etc/passwd
- if test "${use_id}" = "no" ; then
- AC_MSG_CHECKING([for ${ast_user} in /etc/passwd])
- if test -r /etc/passwd ; then
- astuser=`cat /etc/passwd | grep "^${ast_user}:"`
- astgroup=`cat /etc/group | grep "^${ast_group}:"`
- fi
- else
- AC_MSG_CHECKING([for ${ast_user} using id])
- id ${ast_user} > /dev/null 2>&1
- if test "$?" = 0 ; then
- astuser=1
- AC_PATH_PROG(GETENT, getent)
- if test -n "${GETENT}" ; then
- astgroup=`${GETENT} group | grep "^${ast_group}:"`
- else
- astgroup=`cat /etc/group | grep ${ast_group}`
- fi
- fi
+ AC_MSG_CHECKING([for ${ast_user} user])
+ if test -r /etc/passwd ; then
+ astuser=`cat /etc/passwd | grep -c ${ast_user}`
fi
- if test -z "${astuser}" || test -z "${astgroup}" ; then
+ if test "${astuser}" -eq 0 ; then
AC_MSG_RESULT(no)
- AC_MSG_NOTICE(*** Unable to install Asterisk using ${ast_user}:${ast_group} permission; confirm both user and group exist.)
+ AC_MSG_NOTICE(*** Unable to install Asterisk using ${ast_user} user permission; confirm the user exists.)
AC_MSG_NOTICE(*** Please run the 'configure' script with the '--disable-non-root' parameter option)
- AC_MSG_NOTICE(*** or create the appropiate user and group.)
+ AC_MSG_NOTICE(*** or create the appropiate user.)
exit 1
else
- AC_MSG_RESULT([yes, user ${ast_user} and group ${ast_group}])
+ AC_MSG_RESULT(yes)
AST_USER="${ast_user}"
+ AC_SUBST([AST_USER])
+ fi
+
+ AC_MSG_CHECKING([for ${ast_group} group])
+ if test -r /etc/passwd ; then
+ astgroup=`cat /etc/group | grep -c ${ast_group}`
+ fi
+
+ if test "${astgroup}" -eq 0 ; then
+ AC_MSG_RESULT(no)
+ AC_MSG_NOTICE(*** Unable to install Asterisk using ${ast_group} group permission; confirm the group exists.)
+ AC_MSG_NOTICE(*** Please run the 'configure' script with the '--disable-non-root' parameter option)
+ AC_MSG_NOTICE(*** or create the appropiate group.)
+ exit 1
+ else
+ AC_MSG_RESULT(yes)
AST_GROUP="${ast_group}"
- AC_SUBST([AST_USER])
AC_SUBST([AST_GROUP])
fi
fi
Modified: team/pabelanger/non-root/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/non-root/include/asterisk/autoconfig.h.in?view=diff&rev=275854&r1=275853&r2=275854
==============================================================================
--- team/pabelanger/non-root/include/asterisk/autoconfig.h.in (original)
+++ team/pabelanger/non-root/include/asterisk/autoconfig.h.in Mon Jul 12 21:57:49 2010
@@ -806,7 +806,7 @@
/* Define to 1 if you have the `strtoq' function. */
#undef HAVE_STRTOQ
-/* Define to 1 if `st_blksize' is member of `struct stat'. */
+/* Define to 1 if `st_blksize' is a member of `struct stat'. */
#undef HAVE_STRUCT_STAT_ST_BLKSIZE
/* Define to 1 if you have the mISDN Supplemental Services library. */
@@ -1074,11 +1074,11 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-
-/* Define to 1 if the C compiler supports function prototypes. */
-#undef PROTOTYPES
/* Define to necessary symbol if this constant uses a non-standard name on
your system. */
@@ -1098,11 +1098,6 @@
/* Define to the type of arg 5 for `select'. */
#undef SELECT_TYPE_ARG5
-
-/* Define to 1 if the `setvbuf' function takes the buffering type as its
- second argument and the buffer pointer as the third, as on System V before
- release 3. */
-#undef SETVBUF_REVERSED
/* The size of `char *', as computed by sizeof. */
#undef SIZEOF_CHAR_P
@@ -1133,20 +1128,30 @@
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
#undef TM_IN_SYS_TIME
-/* Define to 1 if on AIX 3.
- System headers sometimes define this.
- We just want to avoid a redefinition error message. */
+/* Enable extensions on AIX 3, Interix. */
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
# undef _GNU_SOURCE
#endif
+/* Enable threading extensions on Solaris. */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop. */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
#undef _LARGEFILE_SOURCE
@@ -1163,20 +1168,6 @@
/* Define to 1 if you need to in order for `stat' and other things to work. */
#undef _POSIX_SOURCE
-
-/* Enable extensions on Solaris. */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-
-/* Define like PROTOTYPES; this can be used by system headers. */
-#undef __PROTOTYPES
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
More information about the svn-commits
mailing list