projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Include user.filter, and do not overwrite trust file on updates.
[privoxy.git]
/
jcc.c
diff --git
a/jcc.c
b/jcc.c
index
da261fe
..
7f7206e
100644
(file)
--- a/
jcc.c
+++ b/
jcc.c
@@
-1,4
+1,4
@@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.9
7 2006/08/18 15:23:17 david__schmidt
Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.9
8 2006/08/24 11:01:34 fabiankeil
Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@
-33,6
+33,10
@@
const char jcc_rcs[] = "$Id: jcc.c,v 1.97 2006/08/18 15:23:17 david__schmidt Exp
*
* Revisions :
* $Log: jcc.c,v $
*
* Revisions :
* $Log: jcc.c,v $
+ * Revision 1.98 2006/08/24 11:01:34 fabiankeil
+ * --user fix. Only use the user as group if no group is specified.
+ * Solves BR 1492612. Thanks to Spinor S. and David Laight.
+ *
* Revision 1.97 2006/08/18 15:23:17 david__schmidt
* Windows service (re-)integration
*
* Revision 1.97 2006/08/18 15:23:17 david__schmidt
* Windows service (re-)integration
*
@@
-761,15
+765,20
@@
static int32 server_thread(void *data);
#define sleep(N) DosSleep(((N) * 100))
#endif
#define sleep(N) DosSleep(((N) * 100))
#endif
+#if defined(OSX_DARWIN) || defined(__OpenBSD__)
#ifdef OSX_DARWIN
/*
* Hit OSX over the head with a hammer. Protect all *_r functions.
*/
pthread_mutex_t gmtime_mutex;
pthread_mutex_t localtime_mutex;
#ifdef OSX_DARWIN
/*
* Hit OSX over the head with a hammer. Protect all *_r functions.
*/
pthread_mutex_t gmtime_mutex;
pthread_mutex_t localtime_mutex;
+#endif /* def OSX_DARWIN */
+/*
+ * Protect only the resolve functions for OpenBSD.
+ */
pthread_mutex_t gethostbyaddr_mutex;
pthread_mutex_t gethostbyname_mutex;
pthread_mutex_t gethostbyaddr_mutex;
pthread_mutex_t gethostbyname_mutex;
-#endif /* def
OSX_DARWIN
*/
+#endif /* def
ined(OSX_DARWIN) || defined(__OpenBSD__)
*/
#ifdef FEATURE_PTHREAD
pthread_mutex_t log_mutex;
#ifdef FEATURE_PTHREAD
pthread_mutex_t log_mutex;
@@
-2022,15
+2031,17
@@
int main(int argc, const char *argv[])
InitWin32();
#endif
InitWin32();
#endif
-#if
def OSX_DARWIN
+#if
defined(OSX_DARWIN) || defined(__OpenBSD__)
/*
* Prepare global mutex semaphores
*/
/*
* Prepare global mutex semaphores
*/
+#ifdef OSX_DARWIN
pthread_mutex_init(&gmtime_mutex,0);
pthread_mutex_init(&localtime_mutex,0);
pthread_mutex_init(&gmtime_mutex,0);
pthread_mutex_init(&localtime_mutex,0);
+#endif /* def OSX_DARWIN */
pthread_mutex_init(&gethostbyaddr_mutex,0);
pthread_mutex_init(&gethostbyname_mutex,0);
pthread_mutex_init(&gethostbyaddr_mutex,0);
pthread_mutex_init(&gethostbyname_mutex,0);
-#endif /* def
OSX_DARWIN
*/
+#endif /* def
ined(OSX_DARWIN) || defined(__OpenBSD__)
*/
#ifdef FEATURE_PTHREAD
pthread_mutex_init(&log_mutex,0);
#ifdef FEATURE_PTHREAD
pthread_mutex_init(&log_mutex,0);