Permalink
Browse files

merge to trunk rev 18332

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/ldap-integ@18333 dc483132-0cff-0310-8789-dd5450dbe970
  • Loading branch information...
1 parent ce5ee77 commit 7d05e75f9b6ab0b31eb996989e67a23eb31cb85c raeburn committed Jul 17, 2006
View
@@ -158,9 +158,14 @@ fi
dnl find dlopen
AC_DEFUN([KRB5_AC_FIND_DLOPEN],[
-AC_CHECK_LIB(dl, dlopen,[DL_LIB=-ldl
+old_LIBS="$LIBS"
+DL_LIB=
+AC_SEARCH_LIBS(dlopen, dl, [
+if test "$ac_cv_search_dlopen" != "none required"; then
+ DL_LIB=$ac_cv_search_dlopen
+fi
+LIBS="$old_LIBS"
AC_DEFINE(USE_DLOPEN,1,[Define if dlopen should be used])])
-dnl AC_CHECK_LIB(ld, main, DL_LIB=-lld)
AC_SUBST(DL_LIB)
])
@@ -111,4 +111,3 @@ $(OUTPRE)secure.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(SRCTOP)/include/kerberosIV/des.h $(SRCTOP)/include/kerberosIV/krb.h \
$(srcdir)/../arpa/ftp.h $(srcdir)/../ftp/secure.c secure.h
$(OUTPRE)getdtablesize.$(OBJEXT): $(srcdir)/../../bsd/getdtablesize.c
-$(OUTPRE)setenv.$(OBJEXT): $(srcdir)/../../bsd/setenv.c
@@ -43,11 +43,15 @@ Clear the current keylist. Alias:
.BR clear .
.TP
\fBdelete_entry\fP \fIslot\fP
-Delets the entry in slot number
+Delete the entry in slot number
.I slot
-from the current keylist. Alais:
+from the current keylist. Alias:
.BR delent .
.TP
+\fBadd_entry\fP (\-key | \-password) \-p \fIprincipal\fP \-k \fIkvno\fP \-e \fIenctype\fP
+Add principal to keylist using key or password. Alias:
+.BR addent .
+.TP
.BR list_requests
Displays a listing of available commands. Aliases:
.BR lr ,
@@ -816,9 +816,10 @@ cc_int_ccache_move( cc_ccache_t source,
return code;
}
+cc_int32
cc_int_ccache_lock( cc_ccache_t ccache,
- cc_uint32 lock_type,
- cc_uint32 block )
+ cc_uint32 lock_type,
+ cc_uint32 block )
{
cc_int_ccache_t int_ccache;
cc_msg_t *request = NULL;
@@ -1004,7 +1005,7 @@ cc_int_ccache_get_last_default_time( cc_ccache_t ccache,
}
cc_int32
-cc_int_ccache_get_change_time( cc_ccache_t ccache, cc_time* time )
+cc_int_ccache_get_change_time( cc_ccache_t ccache, cc_time* change_time )
{
cc_int_ccache_t int_ccache;
cc_msg_t *request = NULL;
@@ -1049,7 +1050,7 @@ cc_int_ccache_get_change_time( cc_ccache_t ccache, cc_time* time )
ccmsg_ccache_get_change_time_resp_t * response_header = (ccmsg_ccache_get_change_time_resp_t*)response->header;
t64 = htonll(response_header->time);
/* TODO: validate that we do not overflow 'time' */
- *time = t64;
+ *change_time = t64;
code = ccNoError;
} else {
code = ccErrBadInternalMessage;
@@ -114,11 +114,11 @@ cc_int_ccache_unlock( cc_ccache_t ccache );
cc_int32
cc_int_ccache_get_last_default_time( cc_ccache_t ccache,
- cc_time* time );
+ cc_time* last_default_tim );
cc_int32
cc_int_ccache_get_change_time( cc_ccache_t ccache,
- cc_time* time );
+ cc_time* change_time );
cc_int32
cc_int_ccache_compare( cc_ccache_t ccache,
@@ -128,12 +128,12 @@ cc_int_ccache_compare( cc_ccache_t ccache,
cc_int32
cc_int_ccache_get_kdc_time_offset( cc_ccache_t ccache,
cc_int32 credentials_version,
- cc_time* time_offset );
+ cc_time* kdc_time_offset );
cc_int32
cc_int_ccache_set_kdc_time_offset( cc_ccache_t ccache,
cc_int32 credentials_version,
- cc_time time_offset );
+ cc_time kdc_time_offset );
cc_int32
cc_int_ccache_clear_kdc_time_offset( cc_ccache_t ccache,
@@ -154,7 +154,7 @@ cc_int_context_release( cc_context_t context )
cc_int32
cc_int_context_get_change_time( cc_context_t context,
- cc_time* time)
+ cc_time* change_time)
{
cc_int_context_t int_context;
cc_msg_t *request = NULL;
@@ -199,7 +199,7 @@ cc_int_context_get_change_time( cc_context_t context,
response_header = (ccmsg_ctx_get_change_time_resp_t*)response->header;
t64 = ntohll(response_header->time);
/* TODO: validate that value is not greater than can fit in cc_time */
- *time = (cc_time)t64;
+ *change_time = (cc_time)t64;
code = ccNoError;
} else {
code = ccErrBadInternalMessage;
@@ -66,7 +66,7 @@ cc_int_context_release( cc_context_t context );
cc_int32
cc_int_context_get_change_time( cc_context_t context,
- cc_time* time);
+ cc_time* change_time);
cc_int32
cc_int_context_get_default_ccache_name( cc_context_t context,
@@ -117,7 +117,7 @@ cci_generic_list_new(cc_generic_list_head_t ** listpp)
if (ret == NULL)
return ccErrNoMem;
- ret->type = generic;
+ ret->type = cc_generic_list;
ret->head = ret->tail = NULL;
*listpp = ret;
Oops, something went wrong.

0 comments on commit 7d05e75

Please sign in to comment.