diff options
| author | Russ Allbery <rra@stanford.edu> | 2007-04-16 22:03:54 +0000 |
|---|---|---|
| committer | Russ Allbery <rra@stanford.edu> | 2007-04-16 22:03:54 +0000 |
| commit | f77d9feb2bb1d9e136b9cf7392aa78951bda4c9a (patch) | |
| tree | 56b17cc109f7a57dc7bd398f3db5983439bba0ed /src | |
| parent | 4fc0ae1c5a5abdd76e1e75f96b81b37be5595a5e (diff) | |
| download | krb5-f77d9feb2bb1d9e136b9cf7392aa78951bda4c9a.tar.gz krb5-f77d9feb2bb1d9e136b9cf7392aa78951bda4c9a.tar.xz krb5-f77d9feb2bb1d9e136b9cf7392aa78951bda4c9a.zip | |
Add the new kadm5srv function krb5_get_principal_keys to the export list
Build a separate copy of kadmin/cli/keytab.c for kadmin.local that exposes
the -norandkey flag in a way that doesn't require the compiler support -c
and -o at the same time.
Ticket: 914
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19475 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/kadmin/cli/Makefile.in | 12 | ||||
| -rw-r--r-- | src/kadmin/cli/keytab_local.c | 9 | ||||
| -rw-r--r-- | src/lib/kadm5/srv/libkadm5srv.exports | 1 |
3 files changed, 17 insertions, 5 deletions
diff --git a/src/kadmin/cli/Makefile.in b/src/kadmin/cli/Makefile.in index 7c9320b5c..b63024049 100644 --- a/src/kadmin/cli/Makefile.in +++ b/src/kadmin/cli/Makefile.in @@ -8,7 +8,9 @@ KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS) DEFS= PROG = kadmin -OBJS = kadmin.o kadmin_ct.o ss_wrapper.o getdate.o keytab.o +COMMON_OBJS = kadmin.o kadmin_ct.o ss_wrapper.o getdate.o +KADMIN_OBJS = $(COMMON_OBJS) keytab.o +LOCAL_OBJS = $(COMMON_OBJS) keytab_local.o SRCS = kadmin.c kadmin_ct.c ss_wrapper.c getdate.c keytab.c @@ -16,11 +18,11 @@ LOCALINCLUDES=-I$(srcdir) all:: $(PROG).local $(PROG) -$(PROG).local: $(OBJS) $(SS_DEPLIB) $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS) - $(CC_LINK) -o $(PROG).local $(OBJS) $(SS_LIB) $(KADMSRV_LIBS) $(KDB_DEP_LIB) $(KRB5_BASE_LIBS) +$(PROG).local: $(LOCAL_OBJS) $(SS_DEPLIB) $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS) + $(CC_LINK) -o $(PROG).local $(LOCAL_OBJS) $(SS_LIB) $(KADMSRV_LIBS) $(KDB_DEP_LIB) $(KRB5_BASE_LIBS) -$(PROG): $(OBJS) $(SS_DEPLIB) $(KADMCLNT_DEPLIBS) $(KRB5_BASE_DEPLIBS) - $(CC_LINK) -o $(PROG) $(OBJS) $(SS_LIB) $(KADMCLNT_LIBS) $(KRB5_BASE_LIBS) +$(PROG): $(KADMIN_OBJS) $(SS_DEPLIB) $(KADMCLNT_DEPLIBS) $(KRB5_BASE_DEPLIBS) + $(CC_LINK) -o $(PROG) $(KADMIN_OBJS) $(SS_LIB) $(KADMCLNT_LIBS) $(KRB5_BASE_LIBS) kadmin_ct.o: kadmin_ct.c diff --git a/src/kadmin/cli/keytab_local.c b/src/kadmin/cli/keytab_local.c new file mode 100644 index 000000000..1f029a7a9 --- /dev/null +++ b/src/kadmin/cli/keytab_local.c @@ -0,0 +1,9 @@ +/* + * A wrapper around keytab.c used by kadmin.local to expose the -norandkey + * flag. This avoids building two object files from the same source file, + * which is otherwise tricky with compilers that don't support -c and -o + * at the same time. + */ + +#define KADMIN_LOCAL +#include "keytab.c" diff --git a/src/lib/kadm5/srv/libkadm5srv.exports b/src/lib/kadm5/srv/libkadm5srv.exports index 96a3e4083..23a4ee1e5 100644 --- a/src/lib/kadm5/srv/libkadm5srv.exports +++ b/src/lib/kadm5/srv/libkadm5srv.exports @@ -35,6 +35,7 @@ kadm5_get_config_params kadm5_get_policies kadm5_get_policy kadm5_get_principal +kadm5_get_principal_keys kadm5_get_principals kadm5_get_privs kadm5_init |