Remove OID's that weren't being used, and rename gss_nt_service_name

to nt_service_name to prevent name colision.

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

diff --git a/src/windows/gss/ChangeLog b/src/windows/gss/ChangeLog
index 9de73ec2dea06c34f43e09f1329d668ac0909c57..194527c08a53390054e88e47eb8cdd9633b440a7 100644 (file)
--- a/src/windows/gss/ChangeLog
+++ b/src/windows/gss/ChangeLog
@@ -1,5 +1,9 @@
 Thu Jul 25 02:16:56 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
+       * gss-client.c (client_establish_context): Remove OID's that
+               weren't being used, and rename gss_nt_service_name to
+               nt_service_name to prevent name colision.
+
        * gss.c (parse_name): Add code to parse an optional fourth
                parameter which is the mechanism OID to actually use.  If
                it is ommited, the default mechanism is used.

diff --git a/src/windows/gss/gss-client.c b/src/windows/gss/gss-client.c
index bb0025e8fcb404dcf243b288e8bc476c3048da47..b808306ee25610a145f575f709027c89f72f445d 100644 (file)
--- a/src/windows/gss/gss-client.c
+++ b/src/windows/gss/gss-client.c
@@ -23,16 +23,10 @@
 #include "gss.h"
 
 static const gss_OID_desc oids[] = {
-   {10, "\052\206\110\206\367\022\001\002\001\001"},
-   {10, "\052\206\110\206\367\022\001\002\001\002"},
-   {10, "\052\206\110\206\367\022\001\002\001\003"},
    {10, "\052\206\110\206\367\022\001\002\001\004"},
 };
 
-const gss_OID_desc * gss_nt_user_name = oids+0;
-const gss_OID_desc * gss_nt_machine_uid_name = oids+1;
-const gss_OID_desc * gss_nt_string_uid_name = oids+2;
-const gss_OID_desc * gss_nt_service_name = oids+3;
+const gss_OID_desc * nt_service_name = oids+0;
 
 int
 gss (char *host, char *name, char *oid, char *msg, int port)
@@ -226,7 +220,7 @@ client_establish_context (int s, char *sname, char *oid_name,
     send_tok.value = sname;
     send_tok.length = strlen(sname) + 1;
     maj_stat = gss_import_name(&min_stat, &send_tok,
-        (gss_OID) gss_nt_service_name, &target_name);
+        (gss_OID) service_name, &target_name);
     if (maj_stat != GSS_S_COMPLETE) {
         display_status("parsing name", maj_stat, min_stat);
         return -1;