From 43f77abee03ab8a892bc72b5098dba033c4b654e Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Tue, 21 Jun 2022 14:24:04 -0400 Subject: [PATCH] Removed support for Solaris, which has been dead for at least five years. --- citadel/server/modules/vcard/serv_vcard.c | 5 ----- citadel/server/sysdep.h | 16 ---------------- citadel/server/user_ops.c | 5 ----- citadel/utils/setup.c | 2 +- 4 files changed, 1 insertion(+), 27 deletions(-) diff --git a/citadel/server/modules/vcard/serv_vcard.c b/citadel/server/modules/vcard/serv_vcard.c index cd1bcde31..9c9f98dd5 100644 --- 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 213ff658d..60b3d16c0 100644 --- a/citadel/server/sysdep.h +++ b/citadel/server/sysdep.h @@ -230,23 +230,7 @@ /* Define to 1 if you can safely include both and . */ #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 d341b31c0..7032821e0 100644 --- 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 7cb2f811d..619b8b27e 100644 --- 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"); -- 2.30.2