This commit was manufactured by cvs2svn to create tag

[krb5.git] / src / lib / krb5 / keytab / ktbase.c

diff --git a/src/lib/krb5/keytab/ktbase.c b/src/lib/krb5/keytab/ktbase.c
index 189351c68a03219bd999cac7e5b4796e28f714fd..684c4e477e7f50a36efe90e3fdeb23c080472d50 100644 (file)
--- a/src/lib/krb5/keytab/ktbase.c
+++ b/src/lib/krb5/keytab/ktbase.c
@@ -16,7 +16,10 @@
  * this permission notice appear in supporting documentation, and that
  * the name of M.I.T. not be used in advertising or publicity pertaining
  * to distribution of the software without specific, written prior
- * permission.  M.I.T. makes no representations about the suitability of
+ * permission.  Furthermore if you modify this software you must label
+ * your software as modified software and not distribute it in such a
+ * fashion that it might be confused with the original M.I.T. software.
+ * M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
  * 
@@ -24,26 +27,38 @@
  * Registration functions for keytab.
  */
 
+#include "k5-int.h"
 
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
+extern const krb5_kt_ops krb5_ktf_ops;
+extern const krb5_kt_ops krb5_ktf_writable_ops;
+extern const krb5_kt_ops krb5_kts_ops;
+
+struct krb5_kt_typelist {
+    const krb5_kt_ops *ops;
+    struct krb5_kt_typelist *next;
+};
+static struct krb5_kt_typelist krb5_kt_typelist_wrfile  = {
+    &krb5_ktf_writable_ops,
+    0
+};
+static struct krb5_kt_typelist krb5_kt_typelist_file  = {
+    &krb5_ktf_ops,
+    &krb5_kt_typelist_wrfile
+};
+static struct krb5_kt_typelist krb5_kt_typelist_srvtab = {
+    &krb5_kts_ops,
+    &krb5_kt_typelist_file
+};
+static struct krb5_kt_typelist *kt_typehead = &krb5_kt_typelist_srvtab;
 
-struct krb5_kt_typelist
- {
-  krb5_kt_ops *ops;
-  struct krb5_kt_typelist *next;
- };
-static struct krb5_kt_typelist krb5_kt_typelist_dfl = { &krb5_kt_dfl_ops, 0 };
-static struct krb5_kt_typelist *kt_typehead = &krb5_kt_typelist_dfl;
 
 /*
  * Register a new key table type
  * don't replace if it already exists; return an error instead.
  */
 
-krb5_error_code
-krb5_kt_register(ops)
-krb5_kt_ops *ops;
+krb5_error_code KRB5_CALLCONV
+krb5_kt_register(krb5_context context, krb5_kt_ops *ops)
 {
     struct krb5_kt_typelist *t;
     for (t = kt_typehead;t && strcmp(t->ops->prefix,ops->prefix);t = t->next)
@@ -69,21 +84,21 @@ krb5_kt_ops *ops;
  * particular keytab type.
  */
 
-krb5_error_code krb5_kt_resolve (name, ktid)
-    const char *name;
-    krb5_keytab *ktid;
+krb5_error_code KRB5_CALLCONV
+krb5_kt_resolve (krb5_context context, const char *name, krb5_keytab *ktid)
 {
     struct krb5_kt_typelist *tlist;
-    char *pfx, *resid, *cp;
-    int pfxlen;
+    char *pfx;
+    unsigned int pfxlen;
+    const char *cp, *resid;
     
     cp = strchr (name, ':');
     if (!cp) {
-           return (*krb5_kt_dfl_ops.resolve)(name, ktid);
+           return (*krb5_kt_dfl_ops.resolve)(context, name, ktid);
     }
 
-    pfxlen = cp - (char *)name;
-    resid = (char *)name + pfxlen + 1;
+    pfxlen = cp - name;
+    resid = name + pfxlen + 1;
        
     pfx = malloc (pfxlen+1);
     if (!pfx)
@@ -97,9 +112,83 @@ krb5_error_code krb5_kt_resolve (name, ktid)
     for (tlist = kt_typehead; tlist; tlist = tlist->next) {
        if (strcmp (tlist->ops->prefix, pfx) == 0) {
            free(pfx);
-           return (*tlist->ops->resolve)(resid, ktid);
+           return (*tlist->ops->resolve)(context, resid, ktid);
        }
     }
     free(pfx);
     return KRB5_KT_UNKNOWN_TYPE;
 }
+
+/*
+ * Routines to deal with externalizingt krb5_keytab.
+ *     krb5_keytab_size();
+ *     krb5_keytab_externalize();
+ *     krb5_keytab_internalize();
+ */
+static krb5_error_code krb5_keytab_size
+       (krb5_context, krb5_pointer, size_t *);
+static krb5_error_code krb5_keytab_externalize
+       (krb5_context, krb5_pointer, krb5_octet **, size_t *);
+static krb5_error_code krb5_keytab_internalize
+       (krb5_context,krb5_pointer *, krb5_octet **, size_t *);
+
+/*
+ * Serialization entry for this type.
+ */
+static const krb5_ser_entry krb5_keytab_ser_entry = {
+    KV5M_KEYTAB,                       /* Type                 */
+    krb5_keytab_size,                  /* Sizer routine        */
+    krb5_keytab_externalize,           /* Externalize routine  */
+    krb5_keytab_internalize            /* Internalize routine  */
+};
+
+static krb5_error_code
+krb5_keytab_size(krb5_context kcontext, krb5_pointer arg, size_t *sizep)
+{
+    krb5_error_code    kret;
+    krb5_keytab                keytab;
+    krb5_ser_handle    shandle;
+
+    kret = EINVAL;
+    if ((keytab = (krb5_keytab) arg) &&
+       keytab->ops &&
+       (shandle = (krb5_ser_handle) keytab->ops->serializer) &&
+       shandle->sizer)
+       kret = (*shandle->sizer)(kcontext, arg, sizep);
+    return(kret);
+}
+
+static krb5_error_code
+krb5_keytab_externalize(krb5_context kcontext, krb5_pointer arg, krb5_octet **buffer, size_t *lenremain)
+{
+    krb5_error_code    kret;
+    krb5_keytab                keytab;
+    krb5_ser_handle    shandle;
+
+    kret = EINVAL;
+    if ((keytab = (krb5_keytab) arg) &&
+       keytab->ops &&
+       (shandle = (krb5_ser_handle) keytab->ops->serializer) &&
+       shandle->externalizer)
+       kret = (*shandle->externalizer)(kcontext, arg, buffer, lenremain);
+    return(kret);
+}
+
+static krb5_error_code
+krb5_keytab_internalize(krb5_context kcontext, krb5_pointer *argp, krb5_octet **buffer, size_t *lenremain)
+{
+    krb5_error_code    kret;
+    krb5_ser_handle    shandle;
+
+    kret = EINVAL;
+    if ((shandle = (krb5_ser_handle) krb5_kt_dfl_ops.serializer) &&
+       shandle->internalizer)
+       kret = (*shandle->internalizer)(kcontext, argp, buffer, lenremain);
+    return(kret);
+}
+
+krb5_error_code KRB5_CALLCONV
+krb5_ser_keytab_init(krb5_context kcontext)
+{
+    return(krb5_register_serializer(kcontext, &krb5_keytab_ser_entry));
+}