Removed support for Solaris, which has been dead for at least five years.

diff --git a/citadel/server/modules/vcard/serv_vcard.c b/citadel/server/modules/vcard/serv_vcard.c
index cd1bcde312211d94a180a55bbc824cc7d0fd12af..9c9f98dd5600a6af21c3cc6b4a27ea70bcd83c17 100644 (file)
--- a/citadel/server/modules/vcard/serv_vcard.c
+++ b/citadel/server/modules/vcard/serv_vcard.c
@@ -706,14 +706,9 @@ void vcard_newuser(struct ctdluser *usbuf) {
        if (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_HOST) {
                struct passwd pwd;
                char pwd_buffer[SIZ];
-               
-#ifdef SOLARIS_GETPWUID
-               if (getpwuid_r(usbuf->uid, &pwd, pwd_buffer, sizeof pwd_buffer) != NULL) {
-#else // SOLARIS_GETPWUID
                struct passwd *result = NULL;
                syslog(LOG_DEBUG, "vcard: searching for uid %d", usbuf->uid);
                if (getpwuid_r(usbuf->uid, &pwd, pwd_buffer, sizeof pwd_buffer, &result) == 0) {
-#endif // HAVE_GETPWUID_R
                        snprintf(buf, sizeof buf, "%s@%s", pwd.pw_name, CtdlGetConfigStr("c_fqdn"));
                        vcard_add_prop(v, "email;internet", buf);
                        need_default_vcard = 0;

diff --git a/citadel/server/sysdep.h b/citadel/server/sysdep.h
index 213ff658def91b7549fcc55c6c99683ccf1c7c88..60b3d16c0a53113992f1a35ad06d7bf8b23fdcf3 100644 (file)
--- a/citadel/server/sysdep.h
+++ b/citadel/server/sysdep.h
@@ -230,23 +230,7 @@
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #define TIME_WITH_SYS_TIME 1
 
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# define _ALL_SOURCE 1
-#endif
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE 1
 #endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# define _POSIX_PTHREAD_SEMANTICS 1
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# define _TANDEM_SOURCE 1
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# define __EXTENSIONS__ 1
-#endif

diff --git a/citadel/server/user_ops.c b/citadel/server/user_ops.c
index d341b31c0158db7d25df6575e3c3945a5bfb1d25..7032821e018470355474bfca9ad7a8c69ca29a60 100644 (file)
--- a/citadel/server/user_ops.c
+++ b/citadel/server/user_ops.c
@@ -497,13 +497,8 @@ int CtdlLoginExistingUser(const char *trythisname) {
        
                syslog(LOG_DEBUG, "user_ops: asking host about <%s>", username);
 #ifdef HAVE_GETPWNAM_R
-#ifdef SOLARIS_GETPWUID
-               syslog(LOG_DEBUG, "user_ops: calling getpwnam_r()");
-               tempPwdPtr = getpwnam_r(username, &pd, pwdbuffer, sizeof pwdbuffer);
-#else // SOLARIS_GETPWUID
                syslog(LOG_DEBUG, "user_ops: calling getpwnam_r()");
                getpwnam_r(username, &pd, pwdbuffer, sizeof pwdbuffer, &tempPwdPtr);
-#endif // SOLARIS_GETPWUID
 #else // HAVE_GETPWNAM_R
                syslog(LOG_DEBUG, "user_ops: SHOULD NEVER GET HERE!!!");
                tempPwdPtr = NULL;

diff --git a/citadel/utils/setup.c b/citadel/utils/setup.c
index 7cb2f811d6db3678247d03acebb6cb21a68de11c..619b8b27e168ee02eadec2067833bc858cf91dbf 100644 (file)
--- a/citadel/utils/setup.c
+++ b/citadel/utils/setup.c
@@ -482,7 +482,7 @@ void check_xinetd_entry(void) {
        );
        fclose(fp);
 
-       // Now try to restart the service.  This will not have the intended effect on Solaris, but who uses Solaris anymore?
+       // Now try to restart the service.  (This only works on systemd; others will need to restart it manually.)
        rv = system("systemctl restart xinetd >/dev/null 2>&1");
        if (rv != 0) {
                rv = system("service xinetd restart >/dev/null 2>&1");