[asterisk-commits] pabelanger: branch pabelanger/non-root r261450 - in /team/pabelanger/non-root...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Wed May 5 20:41:49 CDT 2010


Author: pabelanger
Date: Wed May  5 20:41:45 2010
New Revision: 261450

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=261450
Log:
Add logic to check for asterisk user and group.

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=261450&r1=261449&r2=261450
==============================================================================
--- team/pabelanger/non-root/configure.ac (original)
+++ team/pabelanger/non-root/configure.ac Wed May  5 20:41:45 2010
@@ -475,7 +475,63 @@
 	esac])
 AC_SUBST(HAS_POLL)
 
-
+AC_ARG_WITH([user],
+[  --with-user=uid	name of the Asterisk user (default=asterisk)],
+ast_user="${withval}", ast_user="asterisk")
+
+AC_ARG_WITH([group],
+[  --with-group=gid	name of the Asterisk group (default=asterisk)],
+ast_group="${withval}", ast_group="asterisk")
+
+AC_DEFINE_UNQUOTED([AST_USER],"$ast_user",[name of the Asterisk user])
+AC_DEFINE_UNQUOTED([AST_GROUP],"$ast_group",[name of the Asterisk group])
+
+AC_ARG_ENABLE([non-root],
+	[AS_HELP_STRING([--enable-non-root],
+		[Enable non-root Asterisk installation])],
+	[case "${enableval}" in
+		y|ye|yes) test_nonroot="yes" ;;
+		n|no) test_nonroot="no" ;;
+		*) AC_MSG_ERROR(bad value ${enableeval} for --enable-non-root) ;;
+	esac])
+
+dnl Check for asterisk in /etc/passwd
+if test "${test_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
+	fi
+
+	if test -z "${astuser}" || test -z "${astgroup}"
+	then
+		AC_MSG_RESULT(no)
+		AC_MSG_ERROR([User ${ast_user} (and/or group ${ast_group}) doesn't exist. Please read the documentation !])
+	else
+		AC_MSG_RESULT([yes, user ${ast_user} and group ${ast_group}])
+		AST_USER="${ast_user}"
+		AST_GROUP="${ast_group}"
+		AC_SUBST([AST_USER])
+		AC_SUBST([AST_GROUP])
+	fi
+fi
 
 # https support (in main/http.c) uses funopen on BSD systems,
 # fopencookie on linux

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=261450&r1=261449&r2=261450
==============================================================================
--- team/pabelanger/non-root/include/asterisk/autoconfig.h.in (original)
+++ team/pabelanger/non-root/include/asterisk/autoconfig.h.in Wed May  5 20:41:45 2010
@@ -7,8 +7,14 @@
 
 
 
+/* name of the Asterisk group */
+#undef AST_GROUP
+
 /* Define to 1 if internal poll should be used. */
 #undef AST_POLL_COMPAT
+
+/* name of the Asterisk user */
+#undef AST_USER
 
 /* Define to 1 if your system's implementation of mutexes supports comparison
    of a mutex to its initializer. */
@@ -958,7 +964,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 `struct stat' is a member of `st_blksize'. */
 #undef HAVE_STRUCT_STAT_ST_BLKSIZE
 
 /* Define to 1 if you have the mISDN Supplemental Services library. */
@@ -1289,11 +1295,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. */
@@ -1313,11 +1319,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
@@ -1348,20 +1349,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
@@ -1378,20 +1389,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 asterisk-commits mailing list