diff options
| author | Luke Howard <lukeh@padl.com> | 2009-01-02 07:34:10 +0000 |
|---|---|---|
| committer | Luke Howard <lukeh@padl.com> | 2009-01-02 07:34:10 +0000 |
| commit | 340c3f43cc4aff1f7d06c5b6e8f61ba355d70e66 (patch) | |
| tree | d84de806c25e68111c90e85c8fd2042ab367aaad | |
| parent | 0891b59cdc68539ba7fc890345f4555ed3e7475f (diff) | |
| download | krb5-340c3f43cc4aff1f7d06c5b6e8f61ba355d70e66.zip krb5-340c3f43cc4aff1f7d06c5b6e8f61ba355d70e66.tar.gz krb5-340c3f43cc4aff1f7d06c5b6e8f61ba355d70e66.tar.bz2 | |
move common macros into int-proto.h
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/mskrb-integ@21661 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/krb5/krb/gc_frm_kdc.c | 4 | ||||
| -rw-r--r-- | src/lib/krb5/krb/gc_via_tkt.c | 6 | ||||
| -rw-r--r-- | src/lib/krb5/krb/int-proto.h | 6 | ||||
| -rw-r--r-- | src/lib/krb5/krb/valid_times.c | 2 |
4 files changed, 6 insertions, 12 deletions
diff --git a/src/lib/krb5/krb/gc_frm_kdc.c b/src/lib/krb5/krb/gc_frm_kdc.c index a6d9071..2fae835 100644 --- a/src/lib/krb5/krb/gc_frm_kdc.c +++ b/src/lib/krb5/krb/gc_frm_kdc.c @@ -139,10 +139,6 @@ static void tr_dbg_rtree(struct tr_state *, const char *, krb5_principal); #define HARD_CC_ERR(r) ((r) && (r) != KRB5_CC_NOTFOUND && \ (r) != KRB5_CC_NOT_KTYPE) -#define IS_TGS_PRINC(c, p) \ - (krb5_princ_size((c), (p)) == 2 && \ - data_eq_string(*krb5_princ_component((c), (p), 0), KRB5_TGS_NAME)) - /* * Flags for ccache lookups of cross-realm TGTs. * diff --git a/src/lib/krb5/krb/gc_via_tkt.c b/src/lib/krb5/krb/gc_via_tkt.c index 22ac7f9..c73c6d5 100644 --- a/src/lib/krb5/krb/gc_via_tkt.c +++ b/src/lib/krb5/krb/gc_via_tkt.c @@ -31,12 +31,6 @@ #include "k5-int.h" #include "int-proto.h" -#define in_clock_skew(date, now) (labs((date)-(now)) < context->clockskew) - -#define IS_TGS_PRINC(c, p) \ - (krb5_princ_size((c), (p)) == 2 && \ - data_eq_string(*krb5_princ_component((c), (p), 0), KRB5_TGS_NAME)) - static krb5_error_code krb5_kdcrep2creds(krb5_context context, krb5_kdc_rep *pkdcrep, krb5_address *const *address, krb5_data *psectkt, krb5_creds **ppcreds) { diff --git a/src/lib/krb5/krb/int-proto.h b/src/lib/krb5/krb/int-proto.h index b665d8d..b81fe25 100644 --- a/src/lib/krb5/krb/int-proto.h +++ b/src/lib/krb5/krb/int-proto.h @@ -59,5 +59,11 @@ krb5_get_cred_from_kdc_opt(krb5_context context, krb5_ccache ccache, krb5_creds *in_cred, krb5_creds **out_cred, krb5_creds ***tgts, int kdcopt); +#define in_clock_skew(date, now) (labs((date)-(now)) < context->clockskew) + +#define IS_TGS_PRINC(c, p) \ + (krb5_princ_size((c), (p)) == 2 && \ + data_eq_string(*krb5_princ_component((c), (p), 0), KRB5_TGS_NAME)) + #endif /* KRB5_INT_FUNC_PROTO__ */ diff --git a/src/lib/krb5/krb/valid_times.c b/src/lib/krb5/krb/valid_times.c index 9c53d7d..febbc36 100644 --- a/src/lib/krb5/krb/valid_times.c +++ b/src/lib/krb5/krb/valid_times.c @@ -29,8 +29,6 @@ #include "k5-int.h" -#define in_clock_skew(date) (labs((date)-currenttime) < context->clockskew) - /* * This is an internal routine which validates the krb5_timestamps * field in a krb5_ticket. |