[dovecot-cvs] dovecot/src/auth auth-client-connection.c, 1.37, 1.38 auth-request-handler.c, 1.7, 1.8 auth-request-handler.h, 1.4, 1.5

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/auth
In directory talvi:/tmp/cvs-serv31219/src/auth

Modified Files:
	auth-client-connection.c auth-request-handler.c 
	auth-request-handler.h 
Log Message:
Removed unused code



Index: auth-client-connection.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/auth-client-connection.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- auth-client-connection.c	4 Jul 2005 11:32:13 -0000	1.37
+++ auth-client-connection.c	29 Jul 2005 09:21:27 -0000	1.38
@@ -103,7 +103,7 @@
 	/* handshake complete, we can now actually start serving requests */
         conn->refcount++;
 	conn->request_handler =
-		auth_request_handler_create(conn->auth, FALSE,
+		auth_request_handler_create(conn->auth,
 			auth_callback, conn,
 			array_count(&conn->listener->masters) != 0 ?
 			auth_master_request_callback : NULL);

Index: auth-request-handler.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/auth-request-handler.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- auth-request-handler.c	16 Jun 2005 08:21:17 -0000	1.7
+++ auth-request-handler.c	29 Jul 2005 09:21:27 -0000	1.8
@@ -24,15 +24,13 @@
 	void *context;
 
 	auth_request_callback_t *master_callback;
-
-	unsigned int prepend_connect_uid:1;
 };
 
 static buffer_t *auth_failures_buf;
 static struct timeout *to_auth_failures;
 
 struct auth_request_handler *
-auth_request_handler_create(struct auth *auth, int prepend_connect_uid,
+auth_request_handler_create(struct auth *auth,
 			    auth_request_callback_t *callback, void *context,
 			    auth_request_callback_t *master_callback)
 {
@@ -49,7 +47,6 @@
 	handler->callback = callback;
 	handler->context = context;
 	handler->master_callback = master_callback;
-	handler->prepend_connect_uid = prepend_connect_uid;
 	return handler;
 }
 
@@ -148,9 +145,6 @@
 	t_push();
 
 	str = t_str_new(128 + MAX_BASE64_ENCODED_SIZE(reply_size));
-	if (handler->prepend_connect_uid)
-		str_printfa(str, "%u\t", request->connect_uid);
-
 	switch (result) {
 	case AUTH_CLIENT_RESULT_CONTINUE:
 		str_printfa(str, "CONT\t%u\t", request->id);
@@ -229,8 +223,6 @@
 
 	auth_request_log_info(request, request->mech->mech_name, "%s", reason);
 
-	if (handler->prepend_connect_uid)
-		str_printfa(reply, "%u\t", request->connect_uid);
 	str_printfa(reply, "FAIL\t%u\treason=%s", request->id, reason);
 	handler->callback(str_c(reply), handler->context);
 
@@ -354,8 +346,6 @@
 	if (request == NULL) {
 		string_t *reply = t_str_new(64);
 
-		if (handler->prepend_connect_uid)
-			str_printfa(reply, "%u\t", handler->connect_uid);
 		str_printfa(reply, "FAIL\t%u\treason=Timeouted", id);
 		handler->callback(str_c(reply), handler->context);
 		return TRUE;
@@ -394,8 +384,6 @@
 	request->state = AUTH_REQUEST_STATE_FINISHED;
 
 	reply = t_str_new(256);
-	if (handler->prepend_connect_uid)
-		str_printfa(reply, "%u\t", request->connect_uid);
 	if (result == NULL)
 		str_printfa(reply, "NOTFOUND\t%u", request->id);
 	else {
@@ -417,8 +405,6 @@
 	string_t *reply;
 
 	reply = t_str_new(64);
-	if (handler->prepend_connect_uid)
-		str_printfa(reply, "%u\t", handler->connect_uid);
 
 	request = hash_lookup(handler->requests, POINTER_CAST(client_id));
 	if (request == NULL) {

Index: auth-request-handler.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/auth-request-handler.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- auth-request-handler.h	19 Apr 2005 13:11:12 -0000	1.4
+++ auth-request-handler.h	29 Jul 2005 09:21:27 -0000	1.5
@@ -7,7 +7,7 @@
 typedef void auth_request_callback_t(const char *reply, void *context);
 
 struct auth_request_handler *
-auth_request_handler_create(struct auth *auth, int prepend_connect_uid,
+auth_request_handler_create(struct auth *auth,
 			    auth_request_callback_t *callback, void *context,
 			    auth_request_callback_t *master_callback);
 void auth_request_handler_unref(struct auth_request_handler *handler);