This commit merges the RPCSEC_GSS integration branch onto the trunk.

Remaining work includes:

* Default to using kadmin/fqdn for SEAM compatibility

* Namespace cleanups and other API tweaks -- this API is not stable yet

* Fix lib/rpc/unit-test testsuite to test RPCSEC_GSS in addition to
  AUTH_GSSAPI

Additional work will be tracked in separate tickets.  This merge is
bracketed between the tags "tlyu-umich-rpc-merge-pre" and
"tlyu-umich-rpc-merge-post".

ticket: 2578

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16467 dc483132-0cff-0310-8789-dd5450dbe970

3 files changed, 11 insertions, 5 deletions

diff --git a/src/lib/rpc/unit-test/ChangeLog b/src/lib/rpc/unit-test/ChangeLog
index c36b4dcfd0..b4ebf5bd9f 100644
--- a/src/lib/rpc/unit-test/ChangeLog
+++ b/src/lib/rpc/unit-test/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-27  Tom Yu  <tlyu@mit.edu>
+
+	* client.c: rpcint_32 -> int32_t.
+
+	* server.c: Update names of AUTH_GSSAPI functions.
+
 2004-04-02  Ken Raeburn  <raeburn@mit.edu>
 
 	* lib/helpers.exp (expect_kadm_ok): Check for "ERROR" messages and
diff --git a/src/lib/rpc/unit-test/client.c b/src/lib/rpc/unit-test/client.c
index 502001a549..ffe6739cb2 100644
--- a/src/lib/rpc/unit-test/client.c
+++ b/src/lib/rpc/unit-test/client.c
@@ -32,7 +32,7 @@ struct auth_gssapi_data {
 
      /* pre-serialized ah_cred */
      u_char cred_buf[MAX_AUTH_BYTES];
-     rpc_int32 cred_len;
+     int32_t cred_len;
 };
 #define AUTH_PRIVATE(auth) ((struct auth_gssapi_data *)auth->ah_private)
 
diff --git a/src/lib/rpc/unit-test/server.c b/src/lib/rpc/unit-test/server.c
index d4d06287cc..df8f4c9936 100644
--- a/src/lib/rpc/unit-test/server.c
+++ b/src/lib/rpc/unit-test/server.c
@@ -122,14 +122,14 @@ main(int argc, char **argv)
 	  exit(1);
      }
      
-     if (_svcauth_gssapi_set_names(names, 0) == FALSE) {
+     if (svcauth_gssapi_set_names(names, 0) == FALSE) {
 	  fprintf(stderr, "unable to set gssapi names\n");
 	  exit(1);
      }
 
-     _svcauth_gssapi_set_log_badauth_func(rpc_test_badauth, NULL);
-     _svcauth_gssapi_set_log_badverf_func(rpc_test_badverf, NULL);
-     _svcauth_gssapi_set_log_miscerr_func(log_miscerr, NULL);
+     svcauth_gssapi_set_log_badauth_func(rpc_test_badauth, NULL);
+     svcauth_gssapi_set_log_badverf_func(rpc_test_badverf, NULL);
+     svcauth_gssapi_set_log_miscerr_func(log_miscerr, NULL);
 
 #ifdef POSIX_SIGNALS
      (void) sigemptyset(&sa.sa_mask);