diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/krb4/ChangeLog | 14 | ||||
| -rw-r--r-- | src/lib/krb4/cr_tkt.c | 2 | ||||
| -rw-r--r-- | src/lib/krb4/g_admhst.c | 3 | ||||
| -rw-r--r-- | src/lib/krb4/g_cnffile.c | 1 | ||||
| -rw-r--r-- | src/lib/krb4/g_krbhst.c | 3 | ||||
| -rw-r--r-- | src/lib/krb4/g_krbrlm.c | 3 | ||||
| -rw-r--r-- | src/lib/krb4/g_pw_in_tkt.c | 2 | ||||
| -rw-r--r-- | src/lib/krb4/gethostname.c | 2 | ||||
| -rw-r--r-- | src/lib/krb4/krb4int.h | 12 | ||||
| -rw-r--r-- | src/lib/krb4/realmofhost.c | 2 |
10 files changed, 37 insertions, 7 deletions
diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog index cb2a0a7d02..82a4639971 100644 --- a/src/lib/krb4/ChangeLog +++ b/src/lib/krb4/ChangeLog @@ -1,3 +1,17 @@ +2001-06-26 Ezra Peisach <epeisach@mit.edu> + + * krb4int.h: Add prototypes for krb__get_realmsfile(), + krb5 prototypes are declarted from krb.hkrb__get_cnffile() and + krb5 prototypes are declarted from krb.hk_gethostname(). + + * g_pw_in_tkt.c: Declare passwd_to_key() static. + + * cr_tkt.c: Move krb5.h inclusion before krb.h so that certain + krb5 prototypes are declarted from krb.h. + + * g_admhost.c, g_cnffile.c, g_krbhst.c, g_krbrlm.c, gethostname.c + krb5 prototypes are declarted from krb.hrealmofhost.c: + Include krb4int.h and remove prototypes included in there. 2001-06-20 Ezra Peisach <epeisach@mit.edu> diff --git a/src/lib/krb4/cr_tkt.c b/src/lib/krb4/cr_tkt.c index 09e5cf847c..b688f84681 100644 --- a/src/lib/krb4/cr_tkt.c +++ b/src/lib/krb4/cr_tkt.c @@ -24,11 +24,11 @@ * or implied warranty. */ +#include <krb5.h> #include "des.h" #include "krb.h" #include "prot.h" #include <string.h> -#include <krb5.h> static int krb_cr_tkt_int PROTOTYPE((KTEXT tkt, unsigned int flags_in, char *pname, diff --git a/src/lib/krb4/g_admhst.c b/src/lib/krb4/g_admhst.c index c5bed3f68b..abaf481361 100644 --- a/src/lib/krb4/g_admhst.c +++ b/src/lib/krb4/g_admhst.c @@ -12,6 +12,7 @@ #include <stdio.h> #include "krb.h" #include <string.h> +#include "krb4int.h" /* * Given a Kerberos realm, find a host on which the Kerberos database @@ -40,7 +41,7 @@ krb_get_admhst(h, r, n) char FAR *r; int n; { - FILE *cnffile, *krb__get_cnffile(); + FILE *cnffile; char tr[REALM_SZ]; char linebuf[BUFSIZ]; char scratch[64]; diff --git a/src/lib/krb4/g_cnffile.c b/src/lib/krb4/g_cnffile.c index 83654b83f5..c31a9d2190 100644 --- a/src/lib/krb4/g_cnffile.c +++ b/src/lib/krb4/g_cnffile.c @@ -18,6 +18,7 @@ #include <stdio.h> #include "krb.h" #include "k5-int.h" +#include "krb4int.h" krb5_context krb5__krb4_context = 0; diff --git a/src/lib/krb4/g_krbhst.c b/src/lib/krb4/g_krbhst.c index 4e0fd6d764..65bf57fa30 100644 --- a/src/lib/krb4/g_krbhst.c +++ b/src/lib/krb4/g_krbhst.c @@ -12,6 +12,7 @@ #include <stdio.h> #include "krb.h" #include <string.h> +#include "krb4int.h" /* * Given a Kerberos realm, find a host on which the Kerberos authenti- @@ -69,7 +70,7 @@ krb_get_krbhst(h,r,n) char FAR *r; int n; { - FILE *cnffile, *krb__get_cnffile(); + FILE *cnffile; char tr[REALM_SZ]; char linebuf[BUFSIZ]; register int i; diff --git a/src/lib/krb4/g_krbrlm.c b/src/lib/krb4/g_krbrlm.c index 3c381aace9..d31b59a02a 100644 --- a/src/lib/krb4/g_krbrlm.c +++ b/src/lib/krb4/g_krbrlm.c @@ -12,6 +12,7 @@ #include <stdio.h> #include "krb.h" #include <string.h> +#include "krb4int.h" /* * krb_get_lrealm takes a pointer to a string, and a number, n. It fills @@ -33,7 +34,7 @@ krb_get_lrealm(r,n) char *r; int n; { - FILE *cnffile, *krb__get_cnffile(); + FILE *cnffile; if (n > 1) return(KFAILURE); /* Temporary restriction */ diff --git a/src/lib/krb4/g_pw_in_tkt.c b/src/lib/krb4/g_pw_in_tkt.c index 91e24a1c63..b81a4e270f 100644 --- a/src/lib/krb4/g_pw_in_tkt.c +++ b/src/lib/krb4/g_pw_in_tkt.c @@ -47,7 +47,7 @@ * and 0 is returned. */ /*ARGSUSED */ -int +static int passwd_to_key(user,instance,realm,passwd,key) char *user, *instance, *realm, *passwd; C_Block key; diff --git a/src/lib/krb4/gethostname.c b/src/lib/krb4/gethostname.c index 6360a353db..07425e616c 100644 --- a/src/lib/krb4/gethostname.c +++ b/src/lib/krb4/gethostname.c @@ -10,6 +10,8 @@ #include "mit-copyright.h" #define DEFINE_SOCKADDR #include "krb.h" +#include "krb4int.h" + #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/src/lib/krb4/krb4int.h b/src/lib/krb4/krb4int.h index bdd3281d3f..2525d77abe 100644 --- a/src/lib/krb4/krb4int.h +++ b/src/lib/krb4/krb4int.h @@ -2,7 +2,17 @@ * be available for self consistancy in the library. */ - +/* getst.c */ int getst(int, char *, int); +/* tf_util.c */ int tf_save_cred(char *, char *, char *, C_Block, int , int, KTEXT, long); + +/* g_cnffile.c */ +FILE *krb__get_realmsfile(void); + +FILE *krb__get_cnffile(void); + +/* gethostname.c */ +int k_gethostname(char *, int); + diff --git a/src/lib/krb4/realmofhost.c b/src/lib/krb4/realmofhost.c index 684670c6be..b3499de423 100644 --- a/src/lib/krb4/realmofhost.c +++ b/src/lib/krb4/realmofhost.c @@ -21,6 +21,7 @@ #else extern char *malloc(); #endif +#include "krb4int.h" /* * krb_realmofhost. @@ -48,7 +49,6 @@ krb_realmofhost(host) { char *domain; FILE *trans_file; - FILE *krb__get_realmsfile(); /* * This used to be MAXHOSTNAMELEN, but we don't know how big * that will necessarily be on all systems, so assume 1024. |