From 13e79296aca14125c842a302823ef46393bb77ae Mon Sep 17 00:00:00 2001
From: Simon Josefsson <simon@josefsson.org>
Date: Tue, 22 Aug 2006 15:13:10 +0000
Subject: [PATCH] Add GS2.

---
 lib/src/Makefile.am | 4 ++++
 lib/src/init.c      | 9 ++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/lib/src/Makefile.am b/lib/src/Makefile.am
index 4003633..f515d9b 100644
--- a/lib/src/Makefile.am
+++ b/lib/src/Makefile.am
@@ -75,6 +75,10 @@ if GSSAPI
 libgsasl_la_LIBADD += ../gssapi/libgsasl-gssapi.la
 endif			
 
+if GS2
+libgsasl_la_LIBADD += ../gs2/libgsasl-gs2.la
+endif			
+
 if SECURID
 libgsasl_la_LIBADD += ../securid/libgsasl-securid.la
 endif			
diff --git a/lib/src/init.c b/lib/src/init.c
index 69b9b87..dfd18ce 100644
--- a/lib/src/init.c
+++ b/lib/src/init.c
@@ -1,5 +1,5 @@
 /* init.c --- Entry point for libgsasl.
- * Copyright (C) 2002, 2003, 2004, 2005  Simon Josefsson
+ * Copyright (C) 2002, 2003, 2004, 2005, 2006  Simon Josefsson
  *
  * This file is part of GNU SASL Library.
  *
@@ -29,6 +29,7 @@
 #include "cram-md5/cram-md5.h"
 #include "external/external.h"
 #include "gssapi/x-gssapi.h"
+#include "gs2/gs2.h"
 #include "anonymous/anonymous.h"
 #include "plain/plain.h"
 #include "securid/securid.h"
@@ -106,6 +107,12 @@ register_builtin_mechs (Gsasl * ctx)
     return rc;
 #endif /* USE_GSSAPI */
 
+#ifdef USE_GS2
+  rc = gsasl_register (ctx, &gsasl_gs2_krb5_mechanism);
+  if (rc != GSASL_OK)
+    return rc;
+#endif /* USE_GSSAPI */
+
   return GSASL_OK;
 }
 
-- 
2.11.4.GIT