diff options
Diffstat (limited to 'src/kadmin/testing')
| -rw-r--r-- | src/kadmin/testing/util/ChangeLog | 7 | ||||
| -rw-r--r-- | src/kadmin/testing/util/Makefile.in | 15 | ||||
| -rw-r--r-- | src/kadmin/testing/util/tcl_kadm5.c | 5 | ||||
| -rw-r--r-- | src/kadmin/testing/util/tcl_ovsec_kadm.c | 3 |
4 files changed, 20 insertions, 10 deletions
diff --git a/src/kadmin/testing/util/ChangeLog b/src/kadmin/testing/util/ChangeLog index f34d8f8..a81e349 100644 --- a/src/kadmin/testing/util/ChangeLog +++ b/src/kadmin/testing/util/ChangeLog @@ -1,3 +1,10 @@ +2005-06-20 Ken Raeburn <raeburn@mit.edu> + + Novell merge. + * Makefile.in: + * tcl_kadm5.c: + * tcl_ovsec_kadm.c: + 2005-02-10 Tom Yu <tlyu@mit.edu> * tcl_kadm5.c (unparse_err): Add entries for KRB5_CC_NOTFOUND and diff --git a/src/kadmin/testing/util/Makefile.in b/src/kadmin/testing/util/Makefile.in index bc3e730..f53861e 100644 --- a/src/kadmin/testing/util/Makefile.in +++ b/src/kadmin/testing/util/Makefile.in @@ -2,10 +2,11 @@ thisconfigdir=./../.. myfulldir=kadmin/testing/util mydir=testing/util BUILDTOP=$(REL)..$(S)..$(S).. -LOCALINCLUDES = $(TCL_INCLUDES) +LOCALINCLUDES = $(TCL_INCLUDES) -I$(BUILDTOP)/lib/kdb/ # Force Tcl headers to use stdarg.h, because krb5 does too, and if # Tcl uses varargs.h it'll just mess things up. DEFINES= -DHAS_STDARG +KRB5_PTHREAD_LIB=-lpthread PROG_LIBPATH=-L$(TOPLIBD) $(TCL_LIBPATH) PROG_RPATH=$(KRB5_LIBDIR)$(TCL_RPATH) @@ -29,11 +30,11 @@ all-tcl:: $(CLNTPROG) $(SRVPROG) $(SRVPROG): $(OBJS) $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o $(SRVPROG) $(OBJS) $(TCL_MAYBE_RPATH) \ - $(KADMSRV_LIBS) $(KRB5_BASE_LIBS) $(TCL_LIBS) + $(KADMSRV_LIBS) $(KRB5_PTHREAD_LIB) $(KRB5_BASE_LIBS) $(TCL_LIBS) $(CLNTPROG): $(OBJS) $(KADMCLNT_DEPLIBS) $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o $(CLNTPROG) $(OBJS) $(TCL_MAYBE_RPATH) \ - $(KADMCLNT_LIBS) $(KRB5_BASE_LIBS) $(TCL_LIBS) + $(KRB5_PTHREAD_LIB) $(KADMCLNT_LIBS) $(KRB5_BASE_LIBS) $(TCL_LIBS) bsddb_dump: bsddb_dump.o $(CC_LINK) -o bsddb_dump bsddb_dump.o $(KADMSRV_LIBS) @@ -59,8 +60,8 @@ $(OUTPRE)tcl_ovsec_kadm.$(OBJEXT): tcl_ovsec_kadm.c \ $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/socket-utils.h \ $(SRCTOP)/include/krb5/kdb.h $(BUILDTOP)/include/kadm5/kadm_err.h \ - $(BUILDTOP)/include/kadm5/adb_err.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ - tcl_kadm5.h + $(BUILDTOP)/include/kadm5/chpass_util_strings.h tcl_kadm5.h \ + $(BUILDTOP)/lib/kdb/adb_err.h $(OUTPRE)tcl_kadm5.$(OBJEXT): tcl_kadm5.c $(BUILDTOP)/include/kadm5/admin.h \ $(BUILDTOP)/include/gssrpc/rpc.h $(BUILDTOP)/include/gssrpc/types.h \ $(BUILDTOP)/include/gssrpc/rename.h $(BUILDTOP)/include/gssrpc/xdr.h \ @@ -74,6 +75,6 @@ $(OUTPRE)tcl_kadm5.$(OBJEXT): tcl_kadm5.c $(BUILDTOP)/include/kadm5/admin.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/krb5/kdb.h \ - $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/adb_err.h \ - $(BUILDTOP)/include/kadm5/chpass_util_strings.h tcl_kadm5.h + $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ + $(BUILDTOP)/lib/kdb/adb_err.h tcl_kadm5.h $(OUTPRE)test.$(OBJEXT): test.c tcl_kadm5.h diff --git a/src/kadmin/testing/util/tcl_kadm5.c b/src/kadmin/testing/util/tcl_kadm5.c index a6b9452..828f207 100644 --- a/src/kadmin/testing/util/tcl_kadm5.c +++ b/src/kadmin/testing/util/tcl_kadm5.c @@ -11,6 +11,7 @@ #include <k5-int.h> #include <errno.h> #include <stdlib.h> +#include <adb_err.h> #include "tcl_kadm5.h" struct flagval { @@ -1622,12 +1623,12 @@ static int _tcl_kadm5_init_any(enum init_type init_type, ClientData clientData, ret = kadm5_init_with_creds(client_name, cc, service_name, ¶ms, struct_version, - api_version, &server_handle); + api_version, NULL, &server_handle); (void) krb5_cc_close(context, cc); } else ret = kadm5_init(client_name, pass, service_name, ¶ms, - struct_version, api_version, &server_handle); + struct_version, api_version, NULL, &server_handle); if (ret != KADM5_OK) { stash_error(interp, ret); diff --git a/src/kadmin/testing/util/tcl_ovsec_kadm.c b/src/kadmin/testing/util/tcl_ovsec_kadm.c index e67b84d..9aaa850 100644 --- a/src/kadmin/testing/util/tcl_ovsec_kadm.c +++ b/src/kadmin/testing/util/tcl_ovsec_kadm.c @@ -12,6 +12,7 @@ #include <errno.h> #include <stdlib.h> #include "tcl_kadm5.h" +#include <adb_err.h> struct flagval { char *name; @@ -1044,7 +1045,7 @@ static int tcl_ovsec_kadm_init(ClientData clientData, Tcl_Interp *interp, } ret = ovsec_kadm_init(client_name, pass, service_name, realm, - struct_version, api_version, &server_handle); + struct_version, api_version, NULL, &server_handle); if (ret != OVSEC_KADM_OK) { stash_error(interp, ret); |