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;
/* 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
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;
);
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");