[dovecot-cvs] dovecot/src/auth auth-master-connection.c,1.2,1.3 mech.c,1.13,1.14 mech.h,1.11,1.12

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/auth
In directory danu:/tmp/cvs-serv28000

Modified Files:
	auth-master-connection.c mech.c mech.h 
Log Message:
fixes



Index: auth-master-connection.c
===================================================================
RCS file: /home/cvs/dovecot/src/auth/auth-master-connection.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- auth-master-connection.c	22 Aug 2003 03:34:03 -0000	1.2
+++ auth-master-connection.c	22 Aug 2003 06:51:15 -0000	1.3
@@ -153,7 +153,7 @@
 			       master_request);
 
 		/* the auth request is finished, we don't need it anymore */
-		mech_request_free(client_conn, auth_request, request->id);
+		mech_request_free(auth_request, request->id);
 	}
 }
 

Index: mech.c
===================================================================
RCS file: /home/cvs/dovecot/src/auth/mech.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- mech.c	22 Aug 2003 04:57:49 -0000	1.13
+++ mech.c	22 Aug 2003 06:51:15 -0000	1.14
@@ -120,15 +120,17 @@
 	} else {
 		if (!auth_request->auth_continue(auth_request,
 						 request, data, callback))
-			mech_request_free(conn, auth_request, request->id);
+			mech_request_free(auth_request, request->id);
 	}
 }
 
-void mech_request_free(struct auth_client_connection *conn,
-		       struct auth_request *auth_request, unsigned int id)
+void mech_request_free(struct auth_request *auth_request, unsigned int id)
 {
+	if (auth_request->conn != NULL) {
+		hash_remove(auth_request->conn->auth_requests,
+			    POINTER_CAST(id));
+	}
 	auth_request_unref(auth_request);
-	hash_remove(conn->auth_requests, POINTER_CAST(id));
 }
 
 void mech_init_auth_client_reply(struct auth_client_request_reply *reply)
@@ -182,10 +184,8 @@
 
 	auth_request->callback(&reply, reply_data, auth_request->conn);
 
-	if (!success) {
-		mech_request_free(auth_request->conn, auth_request,
-				  auth_request->id);
-	}
+	if (!success)
+		mech_request_free(auth_request, auth_request->id);
 }
 
 int mech_is_valid_username(const char *username)

Index: mech.h
===================================================================
RCS file: /home/cvs/dovecot/src/auth/mech.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- mech.h	22 Aug 2003 04:57:49 -0000	1.11
+++ mech.h	22 Aug 2003 06:51:15 -0000	1.12
@@ -54,8 +54,7 @@
 			   struct auth_client_request_continue *request,
 			   const unsigned char *data,
 			   mech_callback_t *callback);
-void mech_request_free(struct auth_client_connection *conn,
-		       struct auth_request *auth_request, unsigned int id);
+void mech_request_free(struct auth_request *auth_request, unsigned int id);
 
 void mech_init_auth_client_reply(struct auth_client_request_reply *reply);
 void *mech_auth_success(struct auth_client_request_reply *reply,