if (read(fd, &p[i], 1) != 1) {
p[i] = 0;
syslog(LOG_WARNING,"ReadKerberosData: bad read reply len @%d (got \"%s\"", i, p);
- return(KFAILURE);
+ return ZSRV_LEN;
}
if (p[i] == ' ') {
p[i] = '\0';
if (i == 20) {
syslog(LOG_WARNING, "ReadKerberosData: read reply len exceeds buffer");
- return KFAILURE;
+ return ZSRV_BUFSHORT;
}
if (!strncmp(p, "V5-", 3) && (len = atoi(p+3)) > 0)
if ((*proto < 4) | (*proto > 5)) {
syslog(LOG_WARNING, "ReadKerberosData: error parsing authenticator length (\"%s\")", p);
- return KFAILURE;
+ return ZSRV_LEN;
}
if (len <= 0) {
syslog(LOG_WARNING, "ReadKerberosData: read reply len = %d", len);
- return KFAILURE;
+ return ZSRV_LEN;
}
*data = malloc(len);
if (read(fd, &p[i], 1) != 1) {
p[i] = 0;
syslog(LOG_WARNING,"bad read reply len @%d (got \"%s\")", i, p);
- return(KFAILURE);
+ return ZSRV_LEN;
}
if (p[i] == ' ') {
p[i] = '\0';
}
if (i == 20 || strncmp(p, "V5-", 3) || !atoi(p+3)) {
syslog(LOG_WARNING,"bad reply len");
- return ZSRV_PKSHORT;
+ return ZSRV_LEN;
}
data->length = atoi(p+3);
data->data = malloc(data->length);
{
#ifdef HAVE_KRB5
char *authbuf;
- char rlmprincipal[ANAME_SZ+INST_SZ+REALM_SZ+4+1024];
+ char rlmprincipal[MAX_PRINCIPAL_SIZE];
krb5_principal princ;
krb5_data packet;
krb5_ticket *tkt;
return ZAUTH_FAILED;
}
- (void) sprintf(rlmprincipal, "%s/%s@%s", SERVER_SERVICE,
+ (void) snprintf(rlmprincipal, MAX_PRINCIPAL_SIZE, "%s/%s@%s", SERVER_SERVICE,
SERVER_INSTANCE, realm);
packet.length = len;
/* last part is the message body */
cksum2_base = notice->z_message;
cksum2_len = notice->z_message_len;
-
+
+#ifdef HAVE_KRB4 /*XXX*/
if ((!notice->z_ascii_checksum || *notice->z_ascii_checksum != 'Z') &&
key_len == 8 &&
(enctype == ENCTYPE_DES_CBC_CRC ||
return ZAUTH_YES;
} else
return ZAUTH_FAILED;
- }
+ }
+#endif
/* HOLDING: authctx, authenticator */
/* last part is the message body */
cksum2_base = notice->z_message;
- cksum2_len = notice->z_message_len;
-
+ cksum2_len = notice->z_message_len;
+
+#ifdef HAVE_KRB4 /*XXX*/
if ((!notice->z_ascii_checksum || *notice->z_ascii_checksum != 'Z') &&
key_len == 8 &&
(enctype == ENCTYPE_DES_CBC_CRC ||
return ZAUTH_YES;
else
return ZAUTH_FAILED;
- }
+ }
+#endif
/* HOLDING: authctx, authenticator */
#undef KRB5AUTHENT
+#ifdef HAVE_KRB4
static Code_t
ZCheckAuthentication4(ZNotice_t *notice,
struct sockaddr_in *from)
{
-#ifdef HAVE_KRB4
int result;
char srcprincipal[ANAME_SZ+INST_SZ+REALM_SZ+4];
KTEXT_ST authent;
return ZAUTH_FAILED;
return ZAUTH_YES;
-
-#else /* !HAVE_KRB4 */
- return (notice->z_auth) ? ZAUTH_YES : ZAUTH_NO;
-#endif
}
+#endif
#ifdef HAVE_KRB4
return checksum;
}
+#endif
#ifdef HAVE_KRB5
krb5_error_code
#endif
}
#endif
-
-#endif /* HAVE_KRB4 */
-