X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fuser_ops.c;h=db277c5ae4289bea9a0f66c751bfaebfb933a545;hb=eab93370750e7c05c792a007e4e0e4dde4a8a3f9;hp=296a576774442d87ed2a01678d39cdf8d339c6e3;hpb=4c6e691894791003cc46faa150674bf2f8a11c6d;p=citadel.git

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 296a57677..db277c5ae 100644
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -367,11 +367,15 @@ int CtdlLoginExistingUser(char *trythisname)
 		char pwdbuffer[256];
 	
 		lprintf(CTDL_DEBUG, "asking host about <%s>\n", username);
+#ifdef BSD_GETPWUID
+		tempPwdPtr = getpwnam_r(username, &pd, pwdbuffer, sizeof pwdbuffer);
+#else
 		getpwnam_r(username, &pd, pwdbuffer, sizeof pwdbuffer, &tempPwdPtr);
+#endif
 		if (tempPwdPtr == NULL) {
 			return login_not_found;
 		}
-		lprintf(CTDL_DEBUG, "found it! uid=%d, gecos=%s\n", pd.pw_uid, pd.pw_gecos);
+		lprintf(CTDL_DEBUG, "found it! uid=%ld, gecos=%s\n", (long)pd.pw_uid, pd.pw_gecos);
 	
 		/* Locate the associated Citadel account.
 		 * If not found, make one attempt to create it.
@@ -834,7 +838,11 @@ int create_user(char *newusername, int become_user)
 		struct passwd *tempPwdPtr;
 		char pwdbuffer[256];
 	
+#ifdef BSD_GETPWUID
+		tempPwdPtr = getpwnam_r(username, &pd, pwdbuffer, sizeof(pwdbuffer));
+#else
 		getpwnam_r(username, &pd, pwdbuffer, sizeof pwdbuffer, &tempPwdPtr);
+#endif
 		if (tempPwdPtr != NULL) {
 			extract_token(username, pd.pw_gecos, 0, ',', sizeof username);
 			uid = pd.pw_uid;