svn rev #23623: trunk/src/lib/krb5/krb/
tsitkova@MIT.EDU
tsitkova at MIT.EDU
Sat Jan 9 21:12:55 EST 2010
http://src.mit.edu/fisheye/changelog/krb5/?cs=23623
Commit By: tsitkova
Log Message:
Move krb5_authdata_export_authdata into the separate file for better code modularity.
Changed Files:
U trunk/src/lib/krb5/krb/Makefile.in
U trunk/src/lib/krb5/krb/authdata.c
A trunk/src/lib/krb5/krb/authdata_exp.c
Modified: trunk/src/lib/krb5/krb/Makefile.in
===================================================================
--- trunk/src/lib/krb5/krb/Makefile.in 2010-01-09 16:02:13 UTC (rev 23622)
+++ trunk/src/lib/krb5/krb/Makefile.in 2010-01-10 02:12:55 UTC (rev 23623)
@@ -17,6 +17,7 @@
appdefault.o \
auth_con.o \
authdata.o \
+ authdata_exp.o \
authdata_enc.o \
authdata_dec.o \
bld_pr_ext.o \
@@ -114,6 +115,7 @@
$(OUTPRE)appdefault.$(OBJEXT) \
$(OUTPRE)auth_con.$(OBJEXT) \
$(OUTPRE)authdata.$(OBJEXT) \
+ $(OUTPRE)authdata_exp.$(OBJEXT) \
$(OUTPRE)authdata_enc.$(OBJEXT) \
$(OUTPRE)authdata_dec.$(OBJEXT) \
$(OUTPRE)bld_pr_ext.$(OBJEXT) \
@@ -211,6 +213,7 @@
$(srcdir)/appdefault.c \
$(srcdir)/auth_con.c \
$(srcdir)/authdata.c \
+ $(srcdir)/authdata_exp.c \
$(srcdir)/authdata_enc.c \
$(srcdir)/authdata_dec.c \
$(srcdir)/bld_pr_ext.c \
@@ -335,7 +338,7 @@
T_SER_OBJS= t_ser.o ser_actx.o ser_adata.o ser_addr.o ser_auth.o ser_cksum.o \
ser_ctx.o ser_key.o ser_princ.o serialize.o authdata.o pac.o pac_sign.o \
- copy_data.o etype_list.o
+ authdata_exp.o copy_data.o etype_list.o
T_DELTAT_OBJS= t_deltat.o deltat.o
Modified: trunk/src/lib/krb5/krb/authdata.c
===================================================================
--- trunk/src/lib/krb5/krb/authdata.c 2010-01-09 16:02:13 UTC (rev 23622)
+++ trunk/src/lib/krb5/krb/authdata.c 2010-01-10 02:12:55 UTC (rev 23623)
@@ -539,70 +539,6 @@
return code;
}
-krb5_error_code KRB5_CALLCONV
-krb5_authdata_export_authdata(krb5_context kcontext,
- krb5_authdata_context context,
- krb5_flags flags,
- krb5_authdata ***pauthdata)
-{
- int i;
- krb5_error_code code = 0;
- krb5_authdata **authdata = NULL;
- unsigned int len = 0;
-
- *pauthdata = NULL;
-
- for (i = 0; i < context->n_modules; i++) {
- struct _krb5_authdata_context_module *module = &context->modules[i];
- krb5_authdata **authdata2 = NULL;
- int j;
-
- if ((module->flags & flags) == 0)
- continue;
-
- if (module->ftable->export_authdata == NULL)
- continue;
-
- code = (*module->ftable->export_authdata)(kcontext,
- context,
- module->plugin_context,
- *(module->request_context_pp),
- flags,
- &authdata2);
- if (code == ENOENT)
- code = 0;
- else if (code != 0)
- break;
-
- if (authdata2 == NULL)
- continue;
-
- for (j = 0; authdata2[j] != NULL; j++)
- ;
-
- authdata = realloc(authdata, (len + j + 1) * sizeof(krb5_authdata *));
- if (authdata == NULL)
- return ENOMEM;
-
- memcpy(&authdata[len], authdata2, j * sizeof(krb5_authdata *));
- free(authdata2);
-
- len += j;
- }
-
- if (authdata != NULL)
- authdata[len] = NULL;
-
- if (code != 0) {
- krb5_free_authdata(kcontext, authdata);
- return code;
- }
-
- *pauthdata = authdata;
-
- return 0;
-}
-
krb5_error_code
krb5int_authdata_verify(krb5_context kcontext,
krb5_authdata_context context,
Added: trunk/src/lib/krb5/krb/authdata_exp.c
===================================================================
--- trunk/src/lib/krb5/krb/authdata_exp.c (rev 0)
+++ trunk/src/lib/krb5/krb/authdata_exp.c 2010-01-10 02:12:55 UTC (rev 23623)
@@ -0,0 +1,95 @@
+/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ * Copyright 2009 by the Massachusetts Institute of Technology. All
+ * Rights Reserved.
+ *
+ * Export of this software from the United States of America may
+ * require a specific license from the United States Government.
+ * It is the responsibility of any person or organization contemplating
+ * export to obtain such a license before exporting.
+ *
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * 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. 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.
+ *
+ * krb5_authdata_export_authdata()
+ */
+
+#include "k5-int.h"
+#include "authdata.h"
+#include "auth_con.h"
+#include "int-proto.h"
+
+krb5_error_code KRB5_CALLCONV
+krb5_authdata_export_authdata(krb5_context kcontext,
+ krb5_authdata_context context,
+ krb5_flags flags,
+ krb5_authdata ***pauthdata)
+{
+ int i;
+ krb5_error_code code = 0;
+ krb5_authdata **authdata = NULL;
+ unsigned int len = 0;
+
+ *pauthdata = NULL;
+
+ for (i = 0; i < context->n_modules; i++) {
+ struct _krb5_authdata_context_module *module = &context->modules[i];
+ krb5_authdata **authdata2 = NULL;
+ int j;
+
+ if ((module->flags & flags) == 0)
+ continue;
+
+ if (module->ftable->export_authdata == NULL)
+ continue;
+
+ code = (*module->ftable->export_authdata)(kcontext,
+ context,
+ module->plugin_context,
+ *(module->request_context_pp),
+ flags,
+ &authdata2);
+ if (code == ENOENT)
+ code = 0;
+ else if (code != 0)
+ break;
+
+ if (authdata2 == NULL)
+ continue;
+
+ for (j = 0; authdata2[j] != NULL; j++)
+ ;
+
+ authdata = realloc(authdata, (len + j + 1) * sizeof(krb5_authdata *));
+ if (authdata == NULL)
+ return ENOMEM;
+
+ memcpy(&authdata[len], authdata2, j * sizeof(krb5_authdata *));
+ free(authdata2);
+
+ len += j;
+ }
+
+ if (authdata != NULL)
+ authdata[len] = NULL;
+
+ if (code != 0) {
+ krb5_free_authdata(kcontext, authdata);
+ return code;
+ }
+
+ *pauthdata = authdata;
+
+ return 0;
+}
More information about the cvs-krb5
mailing list