Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-04 13:07:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugzilla bug #52404: FreeBSD doesn't have cuserid() either. Thanks to

Browse Source 
Thomas Stromberg <tstromberg@rtci.com> for the bug report.
This commit is contained in:
wtc%netscape.com 2000-09-19 06:05:28 +00:00
parent d5a2efabb1
commit 0ccd4053f0
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
security/nss/lib/ssl/sslsocks.c
View File

@ -34,7 +34,7 @@
* may use your version of this file under either the MPL or the
* GPL.
*
* $Id: sslsocks.c,v 1.2 2000/09/12 20:15:44 jgmyers%netscape.com Exp $
* $Id: sslsocks.c,v 1.3 2000/09/19 06:05:28 wtc%netscape.com Exp $
*/
#include "prtypes.h"
#include "prnetdb.h"
@ -711,11 +711,15 @@ SocksStartGather(sslSocket *ss)
/************************************************************************/
/* BSDI ain't got no cuserid() */
#ifdef __386BSD__
/* BSDI etc. ain't got no cuserid() */
#if defined(__386BSD__) || defined(FREEBSD)
#define NEED_CUSERID 1
#endif
#ifdef NEED_CUSERID
#include <pwd.h>
char *
bsdi_cuserid(char *b)
static char *
my_cuserid(char *b)
{
struct passwd *pw = getpwuid(getuid());
@ -785,8 +789,8 @@ ssl_SocksConnect(sslSocket *ss, const PRNetAddr *sa)
if (!direct) {
/* Find user */
#ifdef XP_UNIX
#ifdef __386BSD__
user = bsdi_cuserid(NULL);
#ifdef NEED_CUSERID
user = my_cuserid(NULL);
#else
user = cuserid(NULL);
#endif
@ -911,8 +915,8 @@ ssl_SocksBind(sslSocket *ss, const PRNetAddr *sa)
/* Find user */
#ifdef XP_UNIX
#ifdef __386BSD__
user = bsdi_cuserid(NULL);
#ifdef NEED_CUSERID
user = my_cuserid(NULL);
#else
user = cuserid(NULL);
#endif