X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserver_main.c;h=a63564d17be70a6b0a63569bc6cb504c5dd8b28f;hb=2cecb84bd7c2108b2e184b7ad196b39deb301ec4;hp=d9c6d17e8b98f864364ed4c4f20273c2f5ef16e6;hpb=e18b92d7b9ae559a42e84a68ca8ca11ae4ddec7c;p=citadel.git diff --git a/citadel/server_main.c b/citadel/server_main.c index d9c6d17e8..a63564d17 100644 --- a/citadel/server_main.c +++ b/citadel/server_main.c @@ -229,11 +229,15 @@ int main(int argc, char **argv) /* on some dists rundir gets purged on startup. so we need to recreate it. */ if (stat(ctdl_run_dir, &filestats)==-1){ +#ifdef HAVE_GETPWUID_R #ifdef SOLARIS_GETPWUID pwp = getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf)); -#else +#else // SOLARIS_GETPWUID getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf), &pwp); -#endif +#endif // SOLARIS_GETPWUID +#else // HAVE_GETPWUID_R + pwp = NULL; +#endif // HAVE_GETPWUID_R mkdir(ctdl_run_dir, 0755); chown(ctdl_run_dir, config.c_ctdluid, (pwp==NULL)?-1:pw.pw_gid); } @@ -304,11 +308,16 @@ int main(int argc, char **argv) if (drop_root_perms) { cdb_chmod_data(); /* make sure we own our data files */ +#ifdef HAVE_GETPWUID_R #ifdef SOLARIS_GETPWUID pwp = getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf)); -#else +#else // SOLARIS_GETPWUID getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf), &pwp); -#endif +#endif // SOLARIS_GETPWUID +#else // HAVE_GETPWUID_R + pwp = NULL; +#endif // HAVE_GETPWUID_R + if (pwp == NULL) CtdlLogPrintf(CTDL_CRIT, "WARNING: getpwuid(%ld): %s\n" "Group IDs will be incorrect.\n", (long)CTDLUID,