[PATCH] Allow numeric uid/gids in User and Group directives

This change allows numeric uid/gids to be specified in the User and
Group directives in tinyproxy.conf. Formerly, only username and group
names were accepted. This fixes bug #15, which was created after
looking at a case on the OpenWrt wiki.

X-Banu-Bugzilla-Ids: 15
---
 src/conffile.c  |    2 +-
 src/tinyproxy.c |   71 ++++++++++++++++++++++++++++++++++++++----------------
 src/tinyproxy.h |    2 +-
 3 files changed, 52 insertions(+), 23 deletions(-)

diff --git a/src/conffile.c b/src/conffile.c
index 2ae1d90..78f5da3 100644
--- a/src/conffile.c
+++ b/src/conffile.c
 <at>  <at>  -557,7 +557,7  <at>  <at>  HANDLE_FUNC(handle_connectport)
 static
 HANDLE_FUNC(handle_user)
 {
-        return set_string_arg(&conf->username, line, &match[2]);
+        return set_string_arg(&conf->user, line, &match[2]);
 }

 static
diff --git a/src/tinyproxy.c b/src/tinyproxy.c
index d185d51..88bc9d3 100644
--- a/src/tinyproxy.c
+++ b/src/tinyproxy.c
 <at>  <at>  -149,6 +149,24  <at>  <at>  Options:\n\

Updating HTML error pages

This patch is against master. It updates the error pages to valid
XHTML format, and also updates their presentation somewhat. I have
checked it with the W3C validator. It'd be nice if someone can review
this patch for any screwups.

[PATCH] fix building of Makefiles in packaging subtree

When ./configure is run, the Makfiles in the packaging subtree's
Makefiles are not created.  As a result, the 'make dist' command will
fail when it attempts to recurse through ./packaging.

Signed-off-by: Jeremy Hinegardner <jeremy@...>
---
 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 237b8c6..64550cc 100644
--- a/configure.ac
+++ b/configure.ac
 <at>  <at>  -349,5 +349,5  <at>  <at>  AC_SUBST(ADDITIONAL_OBJECTS)
 AC_SUBST(TINYPROXY_CONFIG_DIR)
 AC_SUBST(TINYPROXY_CONFIG_FILE)

-AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile packaging/Makefile
packaging/fedora/Makefile packaging/fedora/tinyproxy.spec])
 AC_OUTPUT
--

-- 
1.5.4.5

[PATCH] - fix building of Makefiles and Fedora spec in the packaging subtree - add dist tarball to .gitignore

'make dist' fails as a result of the Makefiles in the packaging 
subtree never being created by configure.

Signed-off-by: Jeremy Hinegardner <jeremy@...>
---
 .gitignore   |    1 +
 configure.ac |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/.gitignore b/.gitignore
index 62e78fb..829e025 100644
--- a/.gitignore
+++ b/.gitignore
 <at>  <at>  -21,3 +21,4  <at>  <at>  ylwrap
 autom4te.cache
 cscope.files
 cscope.out
+tinyproxy-1.6.4.tar.gz
diff --git a/configure.ac b/configure.ac
index 237b8c6..64550cc 100644
--- a/configure.ac
+++ b/configure.ac
 <at>  <at>  -349,5 +349,5  <at>  <at>  AC_SUBST(ADDITIONAL_OBJECTS)
 AC_SUBST(TINYPROXY_CONFIG_DIR)
 AC_SUBST(TINYPROXY_CONFIG_FILE)

-AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile packaging/Makefile
packaging/fedora/Makefile packaging/fedora/tinyproxy.spec])
 AC_OUTPUT

[PATCH] Moved MaxSpareServers exceeded check into function

Since the MaxSpareServers check needs to lock the servers_waiting
variable, moved the code into its own function and removed the need for
two SERVER_COUNT_UNLOCK() calls.

Signed-off-by: Robert James Kaes <rjk@...>
---
 src/child.c |   33 +++++++++++++++++++++------------
 1 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/child.c b/src/child.c
index f8f56cb..f5f26ca 100644
--- a/src/child.c
+++ b/src/child.c
 <at>  <at>  -159,6 +159,24  <at>  <at>  child_configure(child_config_t type, int val)
         return 0;
 }

+
+/*
+ * Check to see if the number of waiting servers exceeds the limit requested
+ * by the user.
+ */
+static inline int
+is_maxspareservers_exceeded(void)
+{
+        int pred;
+
+        SERVER_COUNT_LOCK();
+        pred = *servers_waiting > child_config.maxspareservers;
+        SERVER_COUNT_UNLOCK();

Towards tinyproxy 1.6.4

Hi Jeremy, Karan

We're almost ready for a 1.6.4 release spare a few remaining bugs (after
3 years!) and I want to make sure that we are fine on the packaging
front.

Jeremy: I request you to check something for me as the Fedora packager:

1. Clone the tinyproxy git repo.

2. Checkout the 1.6 branch.

3. Configure and build it. This should build without any odd warnings
or errors (warnings such as unused variables are okay).

4. make dist. This should build a nice tarball for you (the distribution
tarball). Note that while it's named 1.6.4, it's not 1.6.4 yet.

5. Try to make a Fedora package of it using the Fedora spec files inside
it. If something is broken here, please submit patches.

6. Try it out as a user.

That's it! If all of this works, we're fine on the Fedora packaging
front. I am going to try and involve the other major distros too.

Karan: Please can you try the same thing on CentOS too, and submit files
to put inside packaging/centos/ if customizations are necessary to the
Fedora spec?

[PATCH] Fix format strings for size_t

This is on the 1.6 branch.

---
 src/heap.c |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/heap.c b/src/heap.c
index 7986304..be91d76 100644
--- a/src/heap.c
+++ b/src/heap.c
 <at>  <at>  -33,8 +33,8  <at>  <at>  debugging_calloc(size_t nmemb, size_t size, const char *file,
 	assert(size > 0);

 	ptr = calloc(nmemb, size);
-	fprintf(stderr, "{calloc: %p:%u x %u} %s:%lu\n", ptr, nmemb, size, file,
-		line);
+	fprintf(stderr, "{calloc: %p:%zu x %zu} %s:%lu\n",
+                ptr, nmemb, size, file, line);
 	return ptr;
 }

 <at>  <at>  -46,7 +46,8  <at>  <at>  debugging_malloc(size_t size, const char *file, unsigned long line)
 	assert(size > 0);

 	ptr = malloc(size);
-	fprintf(stderr, "{malloc: %p:%u} %s:%lu\n", ptr, size, file, line);
+	fprintf(stderr, "{malloc: %p:%zu} %s:%lu\n",
+                ptr, size, file, line);
 	return ptr;
 }

[PATCH] Refactored netmask array fill with range check

When building a numeric ACL with netmask, range check the supplied
value.  In addition, the code to walk the array has been extracted and
"simplified".

Signed-off-by: Robert James Kaes <rjk@...>
---
 src/acl.c |   47 +++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/src/acl.c b/src/acl.c
index 3e13b96..0d40386 100644
--- a/src/acl.c
+++ b/src/acl.c
 <at>  <at>  -57,6 +57,41  <at>  <at>  struct acl_s {
  */
 static vector_t access_list = NULL;

+
+/*
+ * Fills in the netmask array given a numeric value.
+ *
+ * Returns:
+ *   0 on success
+ *  -1 on failure (invalid mask value)
+ *
+ */
+inline static int
+fill_netmask_array(long int mask, unsigned char array[], unsigned int len)
+{
+        unsigned int i;

website patch for fedora download info

tinyproxy is in Fedora stable.  Here's a patch to relfect that info on the
website.

enjoy,

-jeremy

-- 
========================================================================
 Jeremy Hinegardner                              jeremy@... 

From 00204cfc55e805ac4e82b1da62ad24d37dafe989 Mon Sep 17 00:00:00 2001
From: Jeremy Hinegardner <jeremy@...>
Date: Sun, 15 Jun 2008 10:01:32 -0600
Subject: [PATCH] Update Fedora download information.  Tinyproxy is in Fedora stable.

---
 tinyproxyweb/web/WEB-INF/views/download/index.vm |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/tinyproxyweb/web/WEB-INF/views/download/index.vm b/tinyproxyweb/web/WEB-INF/views/download/index.vm
index b66ddfe..32e7499 100644
--- a/tinyproxyweb/web/WEB-INF/views/download/index.vm
+++ b/tinyproxyweb/web/WEB-INF/views/download/index.vm
 <at>  <at>  -30,10 +30,8  <at>  <at>  packages when they are available.</p>
       href="http://fedoraproject.org/wiki/EPEL">EPEL repository</a> by
       running <tt>yum install tinyproxy</tt>.</li>

New tinyproxy website

Hi all

tinyproxy has a new website: http://tinyproxy.banu.com/

The source code of the web application that powers this website is also
free software: http://git.banu.com/?p=tinyproxy.banu.com;a=summary

It is lacking some pages still, and patches are welcome for this
repository as well! :)

Steffan, you can now point tinyproxy.{com,net,org} to this domain
directly. It will be long-lived.

Recent browsers such as Firefox 3 and IE 7 have made it a point to
strongly discourage accepting SSL certificates that are not signed by
keys of CA certificates that are bundled with the browser software.
Hence, starting on the day our SSL certificate expired and was replaced
by a self-signed one, traffic dropped by 50%. This was verified by
looking at Google Analytics reports. So I thought of first moving to a
website served by plain HTTP, then decided to make a proper website
instead of using a wiki.

		Mukund

git service was unavailable; it's now back

Hi all

The git service at git.banu.com was unavailable to the general public
(although git-daemon was started) for the last 2 days because it was
firewalled by mistake. It was noticed today and has been fixed.

		Mukund