diff options
author | Sam Hartman <hartmans@mit.edu> | 2006-01-27 21:52:49 +0000 |
---|---|---|
committer | Sam Hartman <hartmans@mit.edu> | 2006-01-27 21:52:49 +0000 |
commit | a46812b69fb353574c958396b26bce817d88e20f (patch) | |
tree | 0c813cc7e457b837da8c910056406561460bf289 /src | |
parent | 8636fcdca61537e1226e96a2e2c8cbf28889d02a (diff) | |
parent | 3859c1100296dfba406107fcdf23fc30da385181 (diff) | |
download | krb5-a46812b69fb353574c958396b26bce817d88e20f.zip krb5-a46812b69fb353574c958396b26bce817d88e20f.tar.gz krb5-a46812b69fb353574c958396b26bce817d88e20f.tar.bz2 |
Merge trunk from 17631
git-svn-id: svn://anonsvn.mit.edu/krb5/users/hartmans/ldap-integ@17632 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r-- | src/include/k5-thread.h | 2 | ||||
-rw-r--r-- | src/lib/kdb/ChangeLog | 5 | ||||
-rw-r--r-- | src/lib/kdb/kdb5.c | 39 | ||||
-rw-r--r-- | src/lib/krb5/error_tables/ChangeLog | 4 | ||||
-rw-r--r-- | src/lib/krb5/error_tables/kdb5_err.et | 6 | ||||
-rw-r--r-- | src/lib/krb5/os/locate_kdc.c | 2 | ||||
-rw-r--r-- | src/plugins/kdb/db2/db2_exp.c | 24 | ||||
-rw-r--r-- | src/util/ChangeLog | 6 | ||||
-rw-r--r-- | src/util/depfix.pl | 24 | ||||
-rwxr-xr-x | src/util/export-check.pl | 28 | ||||
-rw-r--r-- | src/util/support/threads.c | 2 |
11 files changed, 130 insertions, 12 deletions
diff --git a/src/include/k5-thread.h b/src/include/k5-thread.h index 2084d44..a42e0e4 100644 --- a/src/include/k5-thread.h +++ b/src/include/k5-thread.h @@ -1,7 +1,7 @@ /* * include/k5-thread.h * - * Copyright 2004 by the Massachusetts Institute of Technology. + * Copyright 2004,2005,2006 by the Massachusetts Institute of Technology. * All Rights Reserved. * * Export of this software from the United States of America may diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog index b1099aa..a0b6f75 100644 --- a/src/lib/kdb/ChangeLog +++ b/src/lib/kdb/ChangeLog @@ -1,3 +1,8 @@ +2006-01-27 Sam Hartman <hartmans@mit.edu> + + * kdb5.c (kdb_load_library): New error codes for library load errors + (kdb_get_conf_section): Note that caller must free result + 2006-01-25 Ken Raeburn <raeburn@mit.edu> * kdb5.h (struct _db_library): Delete all lock-related fields. diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c index 07bc4ab..0db71cd 100644 --- a/src/lib/kdb/kdb5.c +++ b/src/lib/kdb/kdb5.c @@ -1,3 +1,29 @@ +/* + * Copyright 2006 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. + */ + +/*This code was based on code donated to MIT by Novell for distribution under the MIT license.*/ + /* * Include files */ @@ -81,6 +107,7 @@ kdb_unlock_list() #define kdb_lock_lib_lock(a, b) 0 #define kdb_unlock_lib_lock(a, b) 0 +/* Caller must free result*/ static char * kdb_get_conf_section(krb5_context kcontext) @@ -242,7 +269,7 @@ kdb_load_library(krb5_context kcontext, char *lib_name, db_library * lib) { sprintf(buf, "Program not built to support %s database type\n", lib_name); - status = -1; + status = KRB5_KDB_DBTYPE_NOSUP; krb5_db_set_err(kcontext, krb5_err_have_str, status, buf); goto clean_n_exit; } @@ -255,7 +282,7 @@ kdb_load_library(krb5_context kcontext, char *lib_name, db_library * lib) /* ERROR. library not initialized cleanly */ sprintf(buf, "%s library initialization failed, error code %ld\n", lib_name, status); - status = -1; + status = KRB5_KDB_DBTYPE_INIT; krb5_db_set_err(kcontext, krb5_err_have_str, status, buf); goto clean_n_exit; } @@ -267,7 +294,7 @@ kdb_load_library(krb5_context kcontext, char *lib_name, db_library * lib) return status; } -#else +#else /* KDB5_STATIC_LINK*/ static char *db_dl_location[] = DEFAULT_KDB_LIB_PATH; #define db_dl_n_locations (sizeof(db_dl_location) / sizeof(db_dl_location[0])) @@ -352,7 +379,7 @@ kdb_load_library(krb5_context kcontext, char *lib_name, db_library * lib) err_str = dlerror(); if(err_str == NULL) err_str = ""; - status = KRB5_KDB_SERVER_INTERNAL_ERR; + status = KRB5_KDB_DBTYPE_INIT; krb5_kdb_set_err_str (err_str); goto clean_n_exit; } @@ -366,7 +393,7 @@ kdb_load_library(krb5_context kcontext, char *lib_name, db_library * lib) if (!(*lib)->dl_handle) { /* library not found in the given list. Error str is already set */ - status = KRB5_KDB_SERVER_INTERNAL_ERR; + status = KRB5_KDB_DBTYPE_NOTFOUND; krb5_kdb_set_err_str (err_str); goto clean_n_exit; } @@ -502,7 +529,7 @@ kdb_setup_lib_handle(krb5_context kcontext) library = kdb_get_library_name(kcontext); if (library == NULL) { - status = -1; + status = KRB5_KDB_DBTYPE_NOTFOUND; goto clean_n_exit; } diff --git a/src/lib/krb5/error_tables/ChangeLog b/src/lib/krb5/error_tables/ChangeLog index 326106b..bb59895 100644 --- a/src/lib/krb5/error_tables/ChangeLog +++ b/src/lib/krb5/error_tables/ChangeLog @@ -1,3 +1,7 @@ +2006-01-27 Sam Hartman <hartmans@mit.edu> + + * kdb5_err.et: New error codes for plugin errors + 2004-10-13 Alexandra Ellwood <lxs@mit.edu> * krb5_err.et: added KRB5_DELTAT_BADFORMAT for diff --git a/src/lib/krb5/error_tables/kdb5_err.et b/src/lib/krb5/error_tables/kdb5_err.et index f70c54d..d09d040 100644 --- a/src/lib/krb5/error_tables/kdb5_err.et +++ b/src/lib/krb5/error_tables/kdb5_err.et @@ -68,9 +68,13 @@ ec KRB5_KDB_BAD_ENCTYPE, "Unsupported encryption type" ec KRB5_KDB_BAD_CREATEFLAGS, "Bad database creation flags" ec KRB5_KDB_NO_PERMITTED_KEY, "No matching key in entry having a permitted enctype" ec KRB5_KDB_NO_MATCHING_KEY, "No matching key in entry" - ec KRB5_KDB_ACCESS_ERROR, "Unable to access Kerberos database" ec KRB5_KDB_INTERNAL_ERROR, "Kerberos database internal error" ec KRB5_KDB_SERVER_INTERNAL_ERR, "Server error" ec KRB5_KDB_CONSTRAINT_VIOLATION, "Kerberos database constraints violated" +ec KRB5_KDB_DBTYPE_NOTFOUND, "Unable to find requested database type" +ec KRB5_KDB_DBTYPE_NOSUP, "Database type not supported" +ec KRB5_KDB_DBTYPE_INIT, "Database library failed to initialize" + + end diff --git a/src/lib/krb5/os/locate_kdc.c b/src/lib/krb5/os/locate_kdc.c index 484c8e8..50c889d 100644 --- a/src/lib/krb5/os/locate_kdc.c +++ b/src/lib/krb5/os/locate_kdc.c @@ -1,7 +1,7 @@ /* * lib/krb5/os/locate_kdc.c * - * Copyright 1990,2000,2001,2002 by the Massachusetts Institute of Technology. + * Copyright 1990,2000,2001,2002,2003,2004 Massachusetts Institute of Technology. * All Rights Reserved. * * Export of this software from the United States of America may diff --git a/src/plugins/kdb/db2/db2_exp.c b/src/plugins/kdb/db2/db2_exp.c index 29eae05..35f7004 100644 --- a/src/plugins/kdb/db2/db2_exp.c +++ b/src/plugins/kdb/db2/db2_exp.c @@ -1,3 +1,27 @@ +/* + * Copyright 2006 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. + */ + /********************************************************************** * * C %name: db2_exp.c % diff --git a/src/util/ChangeLog b/src/util/ChangeLog index b7c87ca..635f686 100644 --- a/src/util/ChangeLog +++ b/src/util/ChangeLog @@ -1,7 +1,13 @@ +2006-01-26 Ken Raeburn <raeburn@mit.edu> + + * export-check.pl: Accept 'S' in nm output. + 2006-01-25 Ken Raeburn <raeburn@mit.edu> * export-check.pl: New file. + * export-check.pl: Accept 'G' in nm output. + 2005-12-22 Ken Raeburn <raeburn@mit.edu> * depfix.pl (uniquify): New subroutine. diff --git a/src/util/depfix.pl b/src/util/depfix.pl index 09a15dd..c4c233c 100644 --- a/src/util/depfix.pl +++ b/src/util/depfix.pl @@ -1,4 +1,28 @@ #!env perl -w +# +# Copyright 1995,2001,2002,2003,2004,2005 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. +# + eval 'exec perl -S $0 ${1+"$@"}' if 0; $0 =~ s/^.*?(\w+)[\.\w+]*$/$1/; diff --git a/src/util/export-check.pl b/src/util/export-check.pl index 67c8e85..ff2c6e0 100755 --- a/src/util/export-check.pl +++ b/src/util/export-check.pl @@ -1,4 +1,28 @@ # + +# Copyright 2006 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. +# + $0 =~ s/^.*?([\w.-]+)$/$1/; # The real stuff. @@ -26,11 +50,11 @@ while (<NM>) { chop; s/^[0-9a-fA-F]+ +//; next if /^A /; - if (!/^[TDRB] /) { + if (!/^[TDRBGS] /) { unlink $libfile; die "not sure what to do with '$_'"; } - s/^[TDRB] +//; + s/^[TDRBGS] +//; push @found, $_; } @found = sort @found; diff --git a/src/util/support/threads.c b/src/util/support/threads.c index d3b5c1b..d0697bd 100644 --- a/src/util/support/threads.c +++ b/src/util/support/threads.c @@ -1,7 +1,7 @@ /* * util/support/threads.c * - * Copyright 2004,2005 by the Massachusetts Institute of Technology. + * Copyright 2004,2005,2006 by the Massachusetts Institute of Technology. * All Rights Reserved. * * Export of this software from the United States of America may |