dovecot: Factor out duplicated verify_callback() function.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot/rev/0a08fa294c3b
changeset: 5830:0a08fa294c3b
user:      Andrey Panin <pazke at donpac.ru>
date:      Fri Jun 29 16:47:36 2007 +0400
description:
Factor out duplicated verify_callback() function.

diffstat:

5 files changed, 33 insertions(+), 33 deletions(-)
src/auth/Makefile.am    |    2 ++
src/auth/mech-login.c   |   18 ++----------------
src/auth/mech-plain.c   |   19 ++-----------------
src/auth/plain-common.c |   20 ++++++++++++++++++++
src/auth/plain-common.h |    7 +++++++

diffs (126 lines):

diff -r 1d73153584d2 -r 0a08fa294c3b src/auth/Makefile.am
--- a/src/auth/Makefile.am	Fri Jun 29 03:39:27 2007 +0300
+++ b/src/auth/Makefile.am	Fri Jun 29 16:47:36 2007 +0400
@@ -63,6 +63,7 @@ dovecot_auth_SOURCES = \
 	mech-rpa.c \
 	mech-apop.c \
 	otp-skey-common.c \
+	plain-common.c \
 	passdb.c \
 	passdb-blocking.c \
 	passdb-bsdauth.c \
@@ -107,6 +108,7 @@ headers = \
 	mech.h \
 	mycrypt.h \
 	otp-skey-common.h \
+	plain-common.h \
 	passdb.h \
 	passdb-blocking.h \
 	passdb-cache.h \
diff -r 1d73153584d2 -r 0a08fa294c3b src/auth/mech-login.c
--- a/src/auth/mech-login.c	Fri Jun 29 03:39:27 2007 +0300
+++ b/src/auth/mech-login.c	Fri Jun 29 16:47:36 2007 +0400
@@ -10,22 +10,8 @@
 #include "mech.h"
 #include "passdb.h"
 #include "safe-memset.h"
+#include "plain-common.h"
 
-static void verify_callback(enum passdb_result result,
-			    struct auth_request *request)
-{
-	switch (result) {
-	case PASSDB_RESULT_OK:
-		auth_request_success(request, NULL, 0);
-		break;
-	case PASSDB_RESULT_INTERNAL_FAILURE:
-		auth_request_internal_failure(request);
-		break;
-	default:
-		auth_request_fail(request);
-		break;
-	}
-}
 
 static void
 mech_login_auth_continue(struct auth_request *request,
@@ -47,7 +33,7 @@ mech_login_auth_continue(struct auth_req
 				  prompt2, strlen(prompt2));
 	} else {
 		char *pass = p_strndup(unsafe_data_stack_pool, data, data_size);
-		auth_request_verify_plain(request, pass, verify_callback);
+		auth_request_verify_plain(request, pass, plain_verify_callback);
 		safe_memset(pass, 0, strlen(pass));
 	}
 }
diff -r 1d73153584d2 -r 0a08fa294c3b src/auth/mech-plain.c
--- a/src/auth/mech-plain.c	Fri Jun 29 03:39:27 2007 +0300
+++ b/src/auth/mech-plain.c	Fri Jun 29 16:47:36 2007 +0400
@@ -4,22 +4,7 @@
 #include "safe-memset.h"
 #include "mech.h"
 #include "passdb.h"
-
-static void verify_callback(enum passdb_result result,
-			    struct auth_request *request)
-{
-	switch (result) {
-	case PASSDB_RESULT_OK:
-		auth_request_success(request, NULL, 0);
-		break;
-	case PASSDB_RESULT_INTERNAL_FAILURE:
-		auth_request_internal_failure(request);
-		break;
-	default:
-		auth_request_fail(request);
-		break;
-	}
-}
+#include "plain-common.h"
 
 static void
 mech_plain_auth_continue(struct auth_request *request,
@@ -71,7 +56,7 @@ mech_plain_auth_continue(struct auth_req
                 auth_request_fail(request);
         } else {
                 auth_request_verify_plain(request, pass,
-                                          verify_callback);
+                                          plain_verify_callback);
 	}
 
         /* make sure it's cleared */
diff -r 1d73153584d2 -r 0a08fa294c3b src/auth/plain-common.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/auth/plain-common.c	Fri Jun 29 16:47:36 2007 +0400
@@ -0,0 +1,20 @@
+#include "common.h"
+#include "mech.h"
+#include "passdb.h"
+#include "plain-common.h"
+
+void plain_verify_callback(enum passdb_result result,
+			   struct auth_request *request)
+{
+	switch (result) {
+	case PASSDB_RESULT_OK:
+		auth_request_success(request, NULL, 0);
+		break;
+	case PASSDB_RESULT_INTERNAL_FAILURE:
+		auth_request_internal_failure(request);
+		break;
+	default:
+		auth_request_fail(request);
+		break;
+	}
+}
diff -r 1d73153584d2 -r 0a08fa294c3b src/auth/plain-common.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/auth/plain-common.h	Fri Jun 29 16:47:36 2007 +0400
@@ -0,0 +1,7 @@
+#ifndef __PLAIN_COMMON_H__
+#define __PLAIN_COMMON_H__
+
+void plain_verify_callback(enum passdb_result result,
+			   struct auth_request *request);
+
+#endif	/* __PLAIN_COMMON_H__ */