* ktdefname.c (krb5_kt_default_name): Change logic to no longer

	use a global variable; also add krb5_kt_set_default_name() to
	allow for the changing of the default keytab name in the context.

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

diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index d3582787fd71412f0178329d2ae7c22a0ade16e3..f387b178cbf3774189badffddb20e643cc766672 100644 (file)
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,9 @@
+Tue Nov 12 22:07:55 1996  Tom Yu  <tlyu@mit.edu>
+
+       * ktdefname.c (krb5_kt_default_name): Change logic to no longer
+       use a global variable; also add krb5_kt_set_default_name() to
+       allow for the changing of the default keytab name in the context.
+
 Wed Nov  6 16:24:56 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
        * init_os_ctx.c (os_init_paths): Don't ignore errors found from

diff --git a/src/lib/krb5/os/ktdefname.c b/src/lib/krb5/os/ktdefname.c
index 29eb54fe2cfde799aeb26746cea95b73707d9ebc..83bb99278ada838e51e920ba7345f365d2ffb1cf 100644 (file)
--- a/src/lib/krb5/os/ktdefname.c
+++ b/src/lib/krb5/os/ktdefname.c
@@ -28,8 +28,6 @@
 
 #include "k5-int.h"
 
-extern char *krb5_defkeyname;
-
 krb5_error_code
 krb5_kt_default_name(context, name, namesize)
     krb5_context context;
@@ -40,37 +38,57 @@ krb5_kt_default_name(context, name, namesize)
     krb5_error_code code;
     char *retval;
 
-    if ((context->profile_secure == FALSE) &&
-       (cp = getenv("KRB5_KTNAME"))) {
-       strncpy(name, cp, namesize);
-       if (strlen(cp) >= (size_t) namesize)
-           return KRB5_CONFIG_NOTENUFSPACE;
-    } else if (((code = profile_get_string(context->profile,
-                                          "libdefaults",
-                                          "default_keytab_name", NULL, 
-                                          NULL, &retval)) == 0) &&
-              retval) {
-       strncpy(name, retval, namesize);
-       if ((size_t) namesize < strlen(retval))
-           return KRB5_CONFIG_NOTENUFSPACE;
-    } else {
+    if (context->kt_default_name == NULL) {
+       if ((context->profile_secure == FALSE) &&
+           (cp = getenv("KRB5_KTNAME"))) {
+       } else if (((code = profile_get_string(context->profile,
+                                              "libdefaults",
+                                              "default_keytab_name", NULL, 
+                                              NULL, &cp)) == 0) && cp){
+           ;
+       } else {
 #if defined (_MSDOS) || defined(_WIN32)
-       {
-           char    defname[160];
-           int     len;
-
-           len= GetWindowsDirectory( defname, sizeof(defname)-2 );
-           defname[len]= '\0';
-           if ( (len + strlen(krb5_defkeyname) + 1) > namesize )
-               return KRB5_CONFIG_NOTENUFSPACE;
-           sprintf(name, krb5_defkeyname, defname);
-       }
+           {
+               char    defname[160];
+               int     len;
+               
+               len= GetWindowsDirectory( defname, sizeof(defname)-2 );
+               defname[len]= '\0';
+               if ((cp = malloc(strlen(DEFAULT_KEYTAB_NAME) + 1 + len))
+                   == NULL)
+                   return ENOMEM;
+               sprintf(cp, DEFAULT_KEYTAB_NAME, defname);
+           }
 #else
-       strncpy(name, krb5_defkeyname, namesize);
-       if ((size_t) namesize < strlen(krb5_defkeyname))
-           return KRB5_CONFIG_NOTENUFSPACE;
+           if ((cp = malloc(strlen(DEFAULT_KEYTAB_NAME) + 1)) == NULL)
+               return ENOMEM;
+           strcpy(cp, DEFAULT_KEYTAB_NAME);
 #endif
+       }
+       /* cache the result... */
+       if ((context->kt_default_name = malloc(strlen(cp) + 1)) == NULL)
+           return ENOMEM;
+       strcpy(context->kt_default_name, cp);
     }
+    strncpy(name, context->kt_default_name, namesize);
+    if ((size_t) namesize < strlen(context->kt_default_name))
+       return KRB5_CONFIG_NOTENUFSPACE;
     return 0;
 }
-    
+
+krb5_error_code
+krb5_kt_set_default_name(context, name)
+     krb5_context context;
+     char *name;
+{
+    char *cp;
+    if ((cp = malloc(strlen(name) + 1)) == NULL)
+       return ENOMEM;
+    else {
+       strcpy(cp, name);
+       if (context->kt_default_name)
+           free(context->kt_default_name);
+       context->kt_default_name = cp;
+       return 0;
+    }
+}