From 9633c2bf27443fa30d3c89de025e66ba72bcf66c Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Sun, 26 Jan 1997 19:35:43 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1190 ec53bebd-3082-4978-b11e-865c3cabbd6b --- appl/kx/kx.h | 2 +- lib/kafs/afssys.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/appl/kx/kx.h b/appl/kx/kx.h index 40d124f22..8b95e4c3b 100644 --- a/appl/kx/kx.h +++ b/appl/kx/kx.h @@ -130,6 +130,6 @@ int suspicious_address (int sock, struct sockaddr_in addr); #define KX_PORT 2111 -#define KXVERSION "KXSERV.1" +#define KX_VERSION "KXSERV.1" #define COOKIE_TYPE "MIT-MAGIC-COOKIE-1" diff --git a/lib/kafs/afssys.c b/lib/kafs/afssys.c index 631b962fa..61399d037 100644 --- a/lib/kafs/afssys.c +++ b/lib/kafs/afssys.c @@ -113,6 +113,7 @@ static int get_cred(char *princ, char *inst, char *krealm, CREDENTIALS *c, KTEXT_ST *tkt) { int k_errno = krb_get_cred(princ, inst, krealm, c); + if (k_errno != KSUCCESS) { k_errno = krb_mk_req(tkt, princ, inst, krealm, 0); @@ -127,10 +128,12 @@ get_cred(char *princ, char *inst, char *krealm, CREDENTIALS *c, KTEXT_ST *tkt) Return 0 on error */ -static u_int32_t ip_aton(char *ip) +static u_int32_t +ip_aton(char *ip) { u_int32_t addr; unsigned int a, b, c, d; + if(sscanf(ip, "%u.%u.%u.%u", &a, &b, &c, &d) != 4) return 0; if((a | b | c | d) > 255)