svn rev #21661: branches/mskrb-integ/src/lib/krb5/krb/

[lhoward@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=21661
Commit By: lhoward
Log Message:
move common macros into int-proto.h



Changed Files:
U   branches/mskrb-integ/src/lib/krb5/krb/gc_frm_kdc.c
U   branches/mskrb-integ/src/lib/krb5/krb/gc_via_tkt.c
U   branches/mskrb-integ/src/lib/krb5/krb/int-proto.h
U   branches/mskrb-integ/src/lib/krb5/krb/valid_times.c
Modified: branches/mskrb-integ/src/lib/krb5/krb/gc_frm_kdc.c
===================================================================
--- branches/mskrb-integ/src/lib/krb5/krb/gc_frm_kdc.c	2009-01-02 07:27:20 UTC (rev 21660)
+++ branches/mskrb-integ/src/lib/krb5/krb/gc_frm_kdc.c	2009-01-02 07:34:10 UTC (rev 21661)
@@ -139,10 +139,6 @@
 #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.
  *

Modified: branches/mskrb-integ/src/lib/krb5/krb/gc_via_tkt.c
===================================================================
--- branches/mskrb-integ/src/lib/krb5/krb/gc_via_tkt.c	2009-01-02 07:27:20 UTC (rev 21660)
+++ branches/mskrb-integ/src/lib/krb5/krb/gc_via_tkt.c	2009-01-02 07:34:10 UTC (rev 21661)
@@ -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)
 {

Modified: branches/mskrb-integ/src/lib/krb5/krb/int-proto.h
===================================================================
--- branches/mskrb-integ/src/lib/krb5/krb/int-proto.h	2009-01-02 07:27:20 UTC (rev 21660)
+++ branches/mskrb-integ/src/lib/krb5/krb/int-proto.h	2009-01-02 07:34:10 UTC (rev 21661)
@@ -59,5 +59,11 @@
 			   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__ */
 

Modified: branches/mskrb-integ/src/lib/krb5/krb/valid_times.c
===================================================================
--- branches/mskrb-integ/src/lib/krb5/krb/valid_times.c	2009-01-02 07:27:20 UTC (rev 21660)
+++ branches/mskrb-integ/src/lib/krb5/krb/valid_times.c	2009-01-02 07:34:10 UTC (rev 21661)
@@ -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.