* configure.in: check for ncurses if we can't find curses

        * dynloader.c: warning fix
        * sysdep.c: don't complain if initgroups() fails

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 2d70ec3c7745f99be5d45d46ac0005955f0f610e..82af3bf2e327cc66a229e98ed6269c974abeebc7 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -10,6 +10,9 @@
          built by non-root user
        * commands.c: cosmetic cleanup
        * config.c: (security/paranoia) check permissions on citadel.config
+       * configure.in: check for ncurses if we can't find curses
+       * dynloader.c: warning fix
+       * sysdep.c: don't complain if initgroups() fails
 
 Sun Mar 21 14:21:47 EST 1999 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * messages.c: cosmetic cleanups to message reading loop

diff --git a/citadel/configure.in b/citadel/configure.in
index 4c11a186ee31c88f6312e21939a75f63f13e2edc..19f0bc8611fc6dce72adbcb9c38ad845a58e97f7 100644 (file)
--- a/citadel/configure.in
+++ b/citadel/configure.in
@@ -113,7 +113,8 @@ AC_CHECK_LIB(gdbm, gdbm_open)
 save_LIBS=$LIBS
 AC_CHECK_LIB(termcap, tgetent, [LIBS="$LIBS -ltermcap"
        CURSES=-ltermcap])
-AC_CHECK_LIB(curses, initscr, CURSES="-lcurses $CURSES")
+AC_CHECK_LIB(curses, initscr, CURSES="-lcurses $CURSES", [
+       AC_CHECK_LIB(ncurses, initscr, CURSES="-lncurses")])
 LIBS=$save_LIBS
 
 dnl Check for libpthread(s) if we're not using Digital UNIX. (On which the

diff --git a/citadel/dynloader.c b/citadel/dynloader.c
index dcfa4b8a0fc0b8384f2b3fd59f679a268714029d..c03ae8853f67b9d8516bcf43d2c1557473702d89 100644 (file)
--- a/citadel/dynloader.c
+++ b/citadel/dynloader.c
@@ -79,7 +79,7 @@ int DLoader_Exec_Cmd(char *cmdbuf)
 void DLoader_Init(char *pathname)
 {
    void *fcn_handle;
-   char *dl_error;
+   const char *dl_error;
    DIR *dir;
    struct dirent *dptr;
    struct DLModule_Info* (*h_init_fcn)(void);

diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index e1729046600844c1fc6c399232d3a4447306415b..114561ec4b4b496116b9e6c5d823fbda3f67462b 100644 (file)
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -861,9 +861,7 @@ int main(int argc, char **argv)
                                   "Group IDs will be incorrect.\n", BBSUID,
                                strerror(errno));
                else {
-                       if (initgroups(pw->pw_name, pw->pw_gid))
-                               lprintf(3, "initgroups(): %s\n",
-                                       strerror(errno));
+                       initgroups(pw->pw_name, pw->pw_gid);
                        if (setgid(pw->pw_gid))
                                lprintf(3, "setgid(%d): %s\n", pw->pw_gid,
                                        strerror(errno));