---------------------
PatchSet 8439 
Date: 2006/07/31 04:01:19
Author: hno
Branch: ssl-2_6
Tag: (none) 
Log:
Generalize extraction of the SSL user id

Members: 
	src/redirect.c:1.13.22.1->1.13.22.2 
	src/ssl_support.c:1.11.2.3->1.11.2.4 
	src/ssl_support.h:1.6.18.1->1.6.18.2 
	src/stat.c:1.32.6.1->1.32.6.2 

Index: squid/src/redirect.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/redirect.c,v
retrieving revision 1.13.22.1
retrieving revision 1.13.22.2
diff -u -r1.13.22.1 -r1.13.22.2
--- squid/src/redirect.c	31 Jul 2006 03:50:40 -0000	1.13.22.1
+++ squid/src/redirect.c	31 Jul 2006 04:01:19 -0000	1.13.22.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: redirect.c,v 1.13.22.1 2006/07/31 03:50:40 hno Exp $
+ * $Id: redirect.c,v 1.13.22.2 2006/07/31 04:01:19 hno Exp $
  *
  * DEBUG: section 61    Redirector
  * AUTHOR: Duane Wessels
@@ -120,7 +120,7 @@
 	r->client_ident = conn->rfc931;
 #if USE_SSL
     if (!r->client_ident)
-	r->client_ident = sslGetUserId(fd_table[conn->fd].ssl, NULL);
+	r->client_ident = sslGetUserId(fd_table[conn->fd].ssl, conn->port->ssluserid);
 #endif
     if (!r->client_ident)
 	r->client_ident = dash_str;
Index: squid/src/ssl_support.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/ssl_support.c,v
retrieving revision 1.11.2.3
retrieving revision 1.11.2.4
diff -u -r1.11.2.3 -r1.11.2.4
--- squid/src/ssl_support.c	31 Jul 2006 03:50:41 -0000	1.11.2.3
+++ squid/src/ssl_support.c	31 Jul 2006 04:01:19 -0000	1.11.2.4
@@ -915,7 +915,7 @@
 }
 
 const char *
-sslGetUserid(SSL *ssl, const char *attribute)
+sslGetUserId(SSL *ssl, const char *attribute)
 {
     if (!attribute)
 	attribute = Config.SSL.ssluserid;
Index: squid/src/ssl_support.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/ssl_support.h,v
retrieving revision 1.6.18.1
retrieving revision 1.6.18.2
diff -u -r1.6.18.1 -r1.6.18.2
--- squid/src/ssl_support.h	2 Jul 2006 20:16:25 -0000	1.6.18.1
+++ squid/src/ssl_support.h	31 Jul 2006 04:01:20 -0000	1.6.18.2
@@ -53,6 +53,7 @@
 int ssl_shutdown_method(int);
 int ssl_verify_domain(const char *host, SSL *);
 
+const char *sslGetUserId(SSL * ssl, const char *attribute);
 const char *sslGetUserAttribute(SSL * ssl, const char *attribute);
 const char *sslGetCAAttribute(SSL * ssl, const char *attribute);
 const char *sslGetUserCertificatePEM(SSL * ssl);
Index: squid/src/stat.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/stat.c,v
retrieving revision 1.32.6.1
retrieving revision 1.32.6.2
diff -u -r1.32.6.1 -r1.32.6.2
--- squid/src/stat.c	31 Jul 2006 03:50:41 -0000	1.32.6.1
+++ squid/src/stat.c	31 Jul 2006 04:01:20 -0000	1.32.6.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: stat.c,v 1.32.6.1 2006/07/31 03:50:41 hno Exp $
+ * $Id: stat.c,v 1.32.6.2 2006/07/31 04:01:20 hno Exp $
  *
  * DEBUG: section 18    Cache Manager Statistics
  * AUTHOR: Harvest Derived
@@ -1498,7 +1498,7 @@
 	    p = conn->rfc931;
 #if USE_SSL
 	if (!p)
-	    p = sslGetUserEmail(fd_table[conn->fd].ssl, NULL);
+	    p = sslGetUserId(fd_table[conn->fd].ssl, NULL);
 #endif
 	if (!p)
 	    p = dash_str;