*** empty log message ***

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

diff --git a/src/lib/krb5/krb/bld_pr_ext.c b/src/lib/krb5/krb/bld_pr_ext.c
new file mode 100644 (file)
index 0000000..a0fbfc8
--- /dev/null
+++ b/src/lib/krb5/krb/bld_pr_ext.c
@@ -0,0 +1,108 @@
+/*
+ * $Source$
+ * $Author$
+ *
+ * Copyright 1991 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
+ *
+ * For copying and distribution information, please see the file
+ * <krb5/copyright.h>.
+ *
+ * Build a principal from a list of lengths and strings
+ */
+
+#if !defined(lint) && !defined(SABER)
+static char rcsid_bld_princ_c [] =
+"$Id$";
+#endif /* !lint & !SABER */
+
+#include <krb5/krb5.h>
+#include <krb5/ext-proto.h>
+
+#ifdef __STDC__
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+
+krb5_error_code
+#ifdef __STDC__
+krb5_build_principal_ext(krb5_principal *princ, int rlen,
+                        const char *realm, ...)
+#else
+krb5_build_principal_ext(princ, rlen, realm, va_alist)
+krb5_principal *princ;
+int rlen;
+const char *realm;
+va_dcl
+#endif
+{
+    va_list ap;
+    register int i, count = 0, size;
+    register char *next;
+    krb5_principal princ_ret;
+
+#ifdef __STDC__
+    va_start(ap, realm);
+#else
+    va_start(ap);
+#endif
+    /* count up */
+    while (va_arg(ap, int) != 0) {
+       va_arg(ap, char *);             /* pass one up */
+       count++;
+    }
+    va_end(ap);
+
+    /* we do a 2-pass to avoid the need to guess on allocation needs
+       cf. bld_princ.c */
+    /* get space for array and realm, and insert realm */
+    princ_ret = (krb5_principal) malloc(sizeof(*princ_ret) * (count + 2));
+    if (!princ_ret)
+       return ENOMEM;
+    if (!(princ_ret[0] = (krb5_data *) malloc(sizeof(*princ_ret[0])))) {
+       xfree(princ_ret);
+       return ENOMEM;
+    }
+    princ_ret[0]->length = rlen;
+    princ_ret[0]->data = malloc(rlen);
+    if (!princ_ret[0]->data) {
+       xfree(princ_ret[0]);
+       xfree(princ_ret);
+       return ENOMEM;
+    }  
+    memcpy(princ_ret[0]->data, realm, rlen);
+
+    /* process rest of components */
+#ifdef __STDC__
+    va_start(ap, realm);
+#else
+    va_start(ap);
+#endif
+    for (i = 1; i <= count; i++) {
+       if (!(princ_ret[i] =
+             (krb5_data *) malloc(sizeof(*princ_ret[i])))) {
+       free_out:
+           for (i--; i >= 0; i--) {
+               xfree(princ_ret[i]->data);
+               xfree(princ_ret[i]);
+           }
+           xfree(princ_ret);
+           va_end(ap);
+           return (ENOMEM);
+       }
+       size = va_arg(ap, int);
+       next = va_arg(ap, char *);
+       princ_ret[i]->length = size;
+       princ_ret[i]->data = malloc(size);
+       if (!princ_ret[i]->data) {
+           xfree(princ_ret[i]);
+           goto free_out;
+       }
+       memcpy(princ_ret[i]->data, next, size);
+    }
+    princ_ret[count+1] = 0;
+    va_end(ap);
+    *princ = princ_ret;
+    return 0;
+}

diff --git a/src/lib/krb5/krb/bld_princ.c b/src/lib/krb5/krb/bld_princ.c
new file mode 100644 (file)
index 0000000..879f074
--- /dev/null
+++ b/src/lib/krb5/krb/bld_princ.c
@@ -0,0 +1,117 @@
+/*
+ * $Source$
+ * $Author$
+ *
+ * Copyright 1991 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
+ *
+ * For copying and distribution information, please see the file
+ * <krb5/copyright.h>.
+ *
+ * Build a principal from a list of strings
+ */
+
+#if !defined(lint) && !defined(SABER)
+static char rcsid_bld_princ_c [] =
+"$Id$";
+#endif /* !lint & !SABER */
+
+#include <krb5/krb5.h>
+#include <krb5/ext-proto.h>
+
+#ifdef __STDC__
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+
+krb5_error_code
+#ifdef __STDC__
+krb5_build_principal(krb5_principal *princ, int rlen, const char *realm, ...)
+#else
+krb5_build_principal(princ, rlen, realm, va_alist)
+krb5_principal *princ;
+int rlen;
+const char *realm;
+va_dcl
+#endif
+{
+    va_list ap;
+    krb5_error_code retval;
+
+#ifdef __STDC__
+    va_start(ap, realm);
+#else
+    va_start(ap);
+#endif
+    retval = krb5_build_principal_va(princ, realm, ap);
+    va_end(ap);
+    return retval;
+}
+
+krb5_error_code
+krb5_build_principal_va(princ, rlen, realm, ap)
+krb5_principal *princ;
+int rlen;
+const char *realm;
+va_list ap;
+{
+    register int i, count = 0;
+    register char *next;
+    krb5_principal princ_ret;
+
+    /* guess at an initial sufficent count of 2 pieces */
+    count = 2 + 2;             /* plus 2 for realm & null terminator */
+
+    /* get space for array and realm, and insert realm */
+    princ_ret = (krb5_principal) malloc(sizeof(*princ_ret) * (count));
+    if (!princ_ret)
+       return ENOMEM;
+    if (!(princ_ret[0] = (krb5_data *) malloc(sizeof(*princ_ret[0])))) {
+       xfree(princ_ret);
+       return ENOMEM;
+    }
+    princ_ret[0]->length = rlen;
+    princ_ret[0]->data = malloc(rlen);
+    if (!princ_ret[0]->data) {
+       xfree(princ_ret[0]);
+       xfree(princ_ret);
+       return ENOMEM;
+    }
+    memcpy(princ_ret[0]->data, realm, rlen);
+
+    /* process rest of components */
+
+    for (i = 1, next = va_arg(ap, char *);
+        next;
+        next = va_arg(ap, char *), i++) {
+       if (i == count-1) {
+           /* not big enough.  realloc the array */
+           krb5_principal p_tmp;
+           p_tmp = (krb5_principal) realloc((char *)princ_ret, sizeof(*princ_ret)*(count*2));
+           if (!p_tmp)
+               goto free_out;
+           princ_ret = p_tmp;
+           count *= 2;
+       }
+       if (!(princ_ret[i] =
+             (krb5_data *) malloc(sizeof(*princ_ret[i])))) {
+       free_out:
+           for (i--; i >= 0; i--) {
+               xfree(princ_ret[i]->data);
+               xfree(princ_ret[i]);
+           }
+           xfree(princ_ret);
+           return (ENOMEM);
+       }
+       princ_ret[i]->length = strlen(next);
+       princ_ret[i]->data = strdup(next);
+       if (!princ_ret[i]->data) {
+           xfree(princ_ret[i]);
+           goto free_out;
+       }
+    }
+    princ_ret[i] = 0;                  /* put a null as the last entry */
+    *princ = princ_ret;
+    return 0;
+}