From a4c2cee87b1fdf737a95d2a288b47a25aaefbe7c Mon Sep 17 00:00:00 2001
From: ericm <ericm>
Date: Thu, 16 Nov 2006 07:34:58 +0000
Subject: [PATCH] branch: b_new_cmd fix gss daemons build, introduced by last
 commit.

---
 lustre/utils/gss/context_mit.c                |  1 -
 lustre/utils/gss/nfs-utils-1.0.10-lustre.diff | 11 +++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lustre/utils/gss/context_mit.c b/lustre/utils/gss/context_mit.c
index cd6ab0f..cb16a5d 100644
--- a/lustre/utils/gss/context_mit.c
+++ b/lustre/utils/gss/context_mit.c
@@ -39,7 +39,6 @@
 #include <errno.h>
 #include <gssapi/gssapi.h>
 #include <rpc/rpc.h>
-#include <rpc/auth_gss.h>
 #include "gss_util.h"
 #include "gss_oids.h"
 #include "err_util.h"
diff --git a/lustre/utils/gss/nfs-utils-1.0.10-lustre.diff b/lustre/utils/gss/nfs-utils-1.0.10-lustre.diff
index 34f9cd7..122d6d8 100644
--- a/lustre/utils/gss/nfs-utils-1.0.10-lustre.diff
+++ b/lustre/utils/gss/nfs-utils-1.0.10-lustre.diff
@@ -293,6 +293,17 @@ diff -rup nfs-utils-1.0.10.orig/utils/gssd/context_lucid.c nfs-utils-1.0.10/util
  
  		/* derive and send down: Ke, Ki, and Kc */
  
+diff -rup nfs-utils-1.0.10.orig/utils/gssd/context_mit.c nfs-utils-1.0.10/utils/gssd/context_mit.c
+--- nfs-utils-1.0.10.orig/utils/gssd/context_mit.c	2006-11-15 21:26:08.000000000 -0700
++++ nfs-utils-1.0.10/utils/gssd/context_mit.c	2006-11-15 21:44:43.000000000 -0700
+@@ -39,7 +39,6 @@
+ #include <errno.h>
+ #include <gssapi/gssapi.h>
+ #include <rpc/rpc.h>
+-#include <rpc/auth_gss.h>
+ #include "gss_util.h"
+ #include "gss_oids.h"
+ #include "err_util.h"
 diff -rup nfs-utils-1.0.10.orig/utils/gssd/context_spkm3.c nfs-utils-1.0.10/utils/gssd/context_spkm3.c
 --- nfs-utils-1.0.10.orig/utils/gssd/context_spkm3.c	2006-11-15 21:26:08.000000000 -0700
 +++ nfs-utils-1.0.10/utils/gssd/context_spkm3.c	2006-11-15 21:44:43.000000000 -0700
-- 
1.8.3.1