#define roundup(x,y) ((((x)+(y)-1)/(y))*(y))
#endif
+#include "fake-addrinfo.h"
+
#ifdef KERBEROS
#include <krb5.h>
+#ifdef KRB5_KRB4_COMPAT
#include <kerberosIV/krb.h>
+#endif
#include <libpty.h>
#ifdef HAVE_UTMP_H
#include <utmp.h>
int non_privileged = 0; /* set when connection is seen to be from */
/* a non-privileged port */
+#ifdef KRB5_KRB4_COMPAT
AUTH_DAT *v4_kdata;
Key_schedule v4_schedule;
+#endif
#include "com_err.h"
#include "defines.h"
-#define SECURE_MESSAGE "This rlogin session is using DES encryption for all data transmissions.\r\n"
+#define SECURE_MESSAGE "This rlogin session is encrypting all data transmissions.\r\n"
krb5_authenticator *kdata;
krb5_ticket *ticket = 0;
#define VHANG_LAST /* vhangup must occur on close, not open */
#endif
-void fatal(int, const char *), fatalperror(int, const char *), doit(int, struct sockaddr_in *), usage(void), do_krb_login(char *, char *), getstr(int, char *, int, char *);
+void fatal(int, const char *), fatalperror(int, const char *), doit(int, struct sockaddr *), usage(void), do_krb_login(char *, char *), getstr(int, char *, int, char *);
void protocol(int, int);
int princ_maps_to_lname(krb5_principal, char *), default_realm(krb5_principal);
-krb5_sigtype cleanup();
+krb5_sigtype cleanup(int);
krb5_error_code recvauth(int *);
/* There are two authentication related masks:
{
extern int opterr, optind;
extern char * optarg;
- int on = 1, fromlen, ch;
- struct sockaddr_in from;
+ int on = 1, ch;
+ socklen_t fromlen;
+ struct sockaddr_storage from;
int debug_port = 0;
int fd;
int do_fork = 0;
syslog(LOG_ERR, "fork: %s", error_message(errno));
case 0:
(void) close(s);
- doit(fd, &from);
+ doit(fd, (struct sockaddr *) &from);
close(fd);
exit(0);
default:
fd = 0;
}
- doit(fd, &from);
+ doit(fd, (struct sockaddr *) &from);
return 0;
}
void doit(f, fromp)
int f;
- struct sockaddr_in *fromp;
+ struct sockaddr *fromp;
{
int p, t, on = 1;
- register struct hostent *hp;
char c;
+ char hname[NI_MAXHOST];
char buferror[255];
struct passwd *pwd;
#ifdef POSIX_SIGNALS
sa.sa_flags = 0;
#endif
- fromp->sin_port = ntohs((u_short)fromp->sin_port);
- hp = gethostbyaddr((char *) &fromp->sin_addr, sizeof (struct in_addr),
- fromp->sin_family);
- strncpy(rhost_addra, inet_ntoa(fromp->sin_addr), sizeof (rhost_addra));
+ retval = getnameinfo(fromp, socklen(fromp), hname, sizeof(hname), 0, 0,
+ NI_NUMERICHOST);
+ if (retval)
+ fatal(f, gai_strerror(retval));
+ strncpy(rhost_addra, hname, sizeof(rhost_addra));
rhost_addra[sizeof (rhost_addra) -1] = '\0';
- if (hp != NULL) {
- /* Save hostent information.... */
- strncpy(rhost_name,hp->h_name,sizeof (rhost_name));
- rhost_name[sizeof (rhost_name) - 1] = '\0';
- } else
- rhost_name[0] = '\0';
+ retval = getnameinfo(fromp, socklen(fromp), hname, sizeof(hname), 0, 0, 0);
+ if (retval)
+ fatal(f, gai_strerror(retval));
+ strncpy(rhost_name, hname, sizeof(rhost_name));
+ rhost_name[sizeof (rhost_name) - 1] = '\0';
+
+#ifndef KERBEROS
if (fromp->sin_family != AF_INET)
+ /* Not a real problem, we just haven't bothered to update
+ the port number checking code to handle ipv6. */
fatal(f, "Permission denied - Malformed from address\n");
-#ifndef KERBEROS
if (fromp->sin_port >= IPPORT_RESERVED ||
fromp->sin_port < IPPORT_RESERVED/2)
fatal(f, "Permission denied - Connection from bad port");
#endif
protocol(f, p);
signal(SIGCHLD, SIG_IGN);
- cleanup();
+ cleanup(0);
}
unsigned char magic[2] = { 0377, 0377 };
void protocol(f, p)
int f, p;
{
- unsigned char pibuf[BUFSIZ], qpibuf[BUFSIZ*2], fibuf[BUFSIZ], *pbp, *fbp;
+ unsigned char pibuf[BUFSIZ], qpibuf[BUFSIZ*2], fibuf[BUFSIZ], *pbp=0, *fbp=0;
register int pcc = 0, fcc = 0;
int cc;
#ifdef POSIX_SIGNALS
fcc = 0;
} else {
register unsigned char *cp;
- int left, n;
+ int n;
+ size_t left;
if (fcc <= 0)
break;
-krb5_sigtype cleanup()
+krb5_sigtype cleanup(signumber)
+ int signumber;
{
pty_cleanup (line, pid, 1);
shutdown(netf, 2);
#else
(void) ioctl(f, TCFLSH, out);
#endif
- cleanup();
+ cleanup(0);
}
exit(1);
}
#ifdef KERBEROS
-int princ_maps_to_lname(principal, luser)
- krb5_principal principal;
- char *luser;
-{
- char kuser[10];
- if (!(krb5_aname_to_localname(bsd_context, principal,
- sizeof(kuser), kuser))
- && (strcmp(kuser, luser) == 0)) {
- return 1;
- }
- return 0;
-}
-
-int default_realm(principal)
- krb5_principal principal;
-{
- char *def_realm;
- int realm_length;
- int retval;
-
- realm_length = krb5_princ_realm(bsd_context, principal)->length;
-
- if ((retval = krb5_get_default_realm(bsd_context, &def_realm))) {
- return 0;
- }
-
- if ((realm_length != strlen(def_realm)) ||
- (memcmp(def_realm, krb5_princ_realm(bsd_context, principal)->data, realm_length))) {
- free(def_realm);
- return 0;
- }
- free(def_realm);
- return 1;
-}
-
#ifndef KRB_SENDAUTH_VLEN
#define KRB_SENDAUTH_VLEN 8 /* length for version strings */
{
krb5_auth_context auth_context = NULL;
krb5_error_code status;
- struct sockaddr_in peersin, laddr;
- int len;
+ struct sockaddr_storage peersin, laddr;
+ socklen_t len;
krb5_data inbuf;
+#ifdef KRB5_KRB4_COMPAT
char v4_instance[INST_SZ]; /* V4 Instance */
+#endif
krb5_data version;
krb5_authenticator *authenticator;
krb5_rcache rcache;
exit(1);
}
+#ifdef KRB5_KRB4_COMPAT
strcpy(v4_instance, "*");
+#endif
if ((status = krb5_auth_con_init(bsd_context, &auth_context)))
return status;
if (status) return status;
}
- if ((status = krb5_compat_recvauth_version(bsd_context, &auth_context,
+#ifdef KRB5_KRB4_COMPAT
+ status = krb5_compat_recvauth_version(bsd_context, &auth_context,
&netf,
NULL, /* Specify daemon principal */
0, /* no flags */
do_encrypt ? KOPT_DO_MUTUAL : 0, /*v4_opts*/
"rcmd", /* v4_service */
v4_instance, /* v4_instance */
- &peersin, /* foriegn address */
- &laddr, /* our local address */
+ ss2sin(&peersin), /* foriegn address */
+ ss2sin(&laddr), /* our local address */
"", /* use default srvtab */
&ticket, /* return ticket */
&auth_sys, /* which authentication system*/
&v4_kdata, v4_schedule,
- &version))) {
+ &version);
+#else
+ auth_sys = KRB5_RECVAUTH_V5;
+ status = krb5_recvauth_version(bsd_context, &auth_context, &netf,
+ NULL, 0, keytab, &ticket, &version);
+#endif
+ if (status) {
if (auth_sys == KRB5_RECVAUTH_V5) {
/*
* clean up before exiting
if (authenticator->checksum) {
struct sockaddr_in adr;
- int adr_length = sizeof(adr);
+ socklen_t adr_length = sizeof(adr);
char * chksumbuf = (char *) malloc(strlen(term)+strlen(lusername)+32);
if (getsockname(netf, (struct sockaddr *) &adr, &adr_length) != 0)
goto error_cleanup;
return status;
key = 0;
- status = krb5_auth_con_getremotesubkey (bsd_context, auth_context, &key);
+ status = krb5_auth_con_getrecvsubkey (bsd_context, auth_context, &key);
if (status)
fatal (netf, "Server can't get session subkey");
if (!key && do_encrypt && kcmd_proto == KCMD_NEW_PROTOCOL)
projects / krb5.git / blobdiff