[1564] in Kerberos-V5-bugs
Cleanups to beta5
daemon@ATHENA.MIT.EDU (Michael Shields)
Fri Jul 21 22:33:55 1995
Date: Sat, 22 Jul 95 01:43 GMT
From: shields@yage.tembel.org (Michael Shields)
To: krb5-bugs@MIT.EDU
Here are some miscellaneous cleanups to beta5.
Index: appl/bsd/ChangeLog
===================================================================
RCS file: /usr/src/master/security/kerberos/src/appl/bsd/ChangeLog,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ChangeLog
--- ChangeLog 1995/07/18 06:23:42 1.1.1.1
+++ ChangeLog 1995/07/18 10:04:44
@@ -1,3 +1,9 @@
+Tue Jul 18 10:00:55 1995 Michael Shields <shields@tembel.org>
+
+ * krshd.c (main): Cast second arg of accept(2) from sockaddr_in *
+ to sockaddr *.
+
+ * krcp.c (answer_auth): Make filenames[] const.
Fri May 05 09:16:16 1995 Chris Provenzano (proven@mit.edu)
Index: appl/bsd/krcp.c
===================================================================
RCS file: /usr/src/master/security/kerberos/src/appl/bsd/krcp.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 krcp.c
--- krcp.c 1995/07/18 06:23:42 1.1.1.1
+++ krcp.c 1995/07/18 10:04:44
@@ -1343,7 +1343,7 @@
krb5_auth_context *auth_context = NULL;
if (config_file) {
- char * filenames[2];
+ const char *filenames[2];
filenames[1] = NULL;
filenames[0] = config_file;
if (status = krb5_set_config_files(bsd_context, filenames))
Index: appl/bsd/krshd.c
===================================================================
RCS file: /usr/src/master/security/kerberos/src/appl/bsd/krshd.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 krshd.c
--- krshd.c 1995/07/18 06:23:43 1.1.1.1
+++ krshd.c 1995/07/18 10:04:43
@@ -393,7 +393,7 @@
exit(2);
}
- if ((fd = accept(s, &from, &fromlen)) < 0) {
+ if ((fd = accept(s, (struct sockaddr *) &from, &fromlen)) < 0) {
fprintf(stderr, "Error in accept: %s\n", strerror(errno));
exit(2);
}
Index: appl/sample/sserver/ChangeLog
===================================================================
RCS file: /usr/src/master/security/kerberos/src/appl/sample/sserver/ChangeLog,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ChangeLog
--- ChangeLog 1995/07/18 06:23:47 1.1.1.1
+++ ChangeLog 1995/07/18 10:04:45
@@ -1,3 +1,8 @@
+Tue Jul 18 09:57:43 1995 Michael Shields <shields@tembel.org>
+
+ * sserver.c (main): Cast second arg of bind(2) from sockaddr_in *
+ to sockaddr *.
+
Wed May 03 03:30:51 1995 Chris Provenzano (proven@mit.edu)
* sserver.c: (krb5_recvauth()): No longer needs the rc_type arg.
Index: appl/sample/sserver/sserver.c
===================================================================
RCS file: /usr/src/master/security/kerberos/src/appl/sample/sserver/sserver.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 sserver.c
--- sserver.c 1995/07/18 06:23:47 1.1.1.1
+++ sserver.c 1995/07/18 10:04:45
@@ -99,7 +99,7 @@
sin.sin_family = AF_INET;
sin.sin_addr.s_addr = 0;
sin.sin_port = htons(atoi(argv[1]));
- if (bind(sock, &sin, sizeof(sin))) {
+ if (bind(sock, (struct sockaddr *) &sin, sizeof(sin))) {
syslog(LOG_ERR, "bind: %m");
exit(3);
}
Index: appl/telnet/telnetd/ChangeLog
===================================================================
RCS file: /usr/src/master/security/kerberos/src/appl/telnet/telnetd/ChangeLog,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ChangeLog
--- ChangeLog 1995/07/18 06:23:57 1.1.1.1
+++ ChangeLog 1995/07/18 10:04:43
@@ -1,3 +1,7 @@
+Tue Jul 18 10:03:11 1995 Michael Shields <shields@tembel.org>
+
+ * telnetd.c (doit): Make host const.
+
Wed May 3 16:50:05 1995 Mark Eichin <eichin@cygnus.com>
* telnetd.c: respect HAVE_SYS_TTY_H.
Index: appl/telnet/telnetd/telnetd.c
===================================================================
RCS file: /usr/src/master/security/kerberos/src/appl/telnet/telnetd/telnetd.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 telnetd.c
--- telnetd.c 1995/07/18 06:23:59 1.1.1.1
+++ telnetd.c 1995/07/18 10:30:24
@@ -825,7 +825,8 @@
doit(who)
struct sockaddr_in *who;
{
- char *host, *inet_ntoa();
+ const char *host;
+ char *inet_ntoa();
struct hostent *hp;
int level;
int ptynum;
Index: kadmin/v5server/ChangeLog
===================================================================
RCS file: /usr/src/master/security/kerberos/src/kadmin/v5server/ChangeLog,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ChangeLog
--- ChangeLog 1995/07/18 06:24:09 1.1.1.1
+++ ChangeLog 1995/07/19 11:27:52
@@ -1,3 +1,12 @@
+Wed Jul 19 11:27:41 1995 Michael Shields <shields@tembel.org>
+
+ * srv_net.c (net_init): Use ADM5_DEFAULT_PORT if #defined.
+
+Tue Jul 18 08:56:46 1995 Michael Shields <shields@tembel.org>
+
+ * configure.in: Add AC_C_CONST.
+
+ * srv_output.c (lang_error_message): Make ermsg const.
Fri May 5 11:11:39 EDT 1995 Paul Park (pjpark@mit.edu)
#ifdef out language flags. Remove description from manpage.
Index: kadmin/v5server/configure.in
===================================================================
RCS file: /usr/src/master/security/kerberos/src/kadmin/v5server/configure.in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 configure.in
--- configure.in 1995/07/18 06:24:09 1.1.1.1
+++ configure.in 1995/07/18 23:57:29
@@ -6,6 +6,7 @@
WITH_NETLIB
AC_CHECK_LIB(ndbm,main)
AC_CHECK_LIB(dbm,main)
+AC_C_CONST
AC_FUNC_CHECK(waitpid,AC_DEFINE(HAVE_WAITPID))
AC_FUNC_CHECK(vsprintf,AC_DEFINE(HAVE_VSPRINTF))
CHECK_WAIT_TYPE
Index: kadmin/v5server/srv_net.c
===================================================================
RCS file: /usr/src/master/security/kerberos/src/kadmin/v5server/srv_net.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 srv_net.c
--- srv_net.c 1995/07/18 06:24:10 1.1.1.1
+++ srv_net.c 1995/07/19 11:29:12
@@ -38,6 +38,7 @@
#include "com_err.h"
#include "kadm5_defs.h"
#include "adm.h"
+#include "adm_defs.h"
#define MAX_BIND_TRIES 5
@@ -466,13 +467,20 @@
ntohl(net_server_addr.sin_addr.s_addr)));
/* Get the service entry */
- if (!(our_servent = getservbyname(KRB5_ADM_SERVICE_NAME, "tcp"))) {
+ our_servent = getservbyname(KRB5_ADM_SERVICE_NAME, "tcp");
+#ifdef ADM5_DEFAULT_PORT
+ if (!our_servent)
+ net_server_addr.sin_port = ADM5_DEFAULT_PORT;
+#else /* not ADM5_DEFAULT_PORT */
+ if (!our_servent) {
kret = errno;
fprintf(stderr, net_no_servent_fmt, programname,
KRB5_ADM_SERVICE_NAME, error_message(kret));
goto done;
}
- net_server_addr.sin_port = our_servent->s_port;
+#endif /* not ADM5_DEFAULT_PORT */
+ else
+ net_server_addr.sin_port = our_servent->s_port;
net_server_addr_init = 1;
DPRINT(DEBUG_HOST, net_debug_level,
("- service name (%s) is on port %d\n", our_servent->s_name,
Index: kadmin/v5server/srv_output.c
===================================================================
RCS file: /usr/src/master/security/kerberos/src/kadmin/v5server/srv_output.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 srv_output.c
--- srv_output.c 1995/07/18 06:24:10 1.1.1.1
+++ srv_output.c 1995/07/18 08:56:58
@@ -62,7 +62,7 @@
krb5_error_code kval;
{
char *ret;
- char *ermsg;
+ const char *ermsg;
ermsg = error_message(kval);
if (lang && output_lang_supported(lang)) {
Index: kadmin.old/client/ChangeLog
===================================================================
RCS file: /usr/src/master/security/kerberos/src/kadmin.old/client/ChangeLog,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ChangeLog
--- ChangeLog 1995/07/18 09:00:50 1.1.1.1
+++ ChangeLog 1995/07/18 09:43:42
@@ -1,3 +1,8 @@
+Tue Jul 18 09:43:23 1995 Michael Shields <shields@tembel.org>
+
+ * kadmin.c (adm5_init_link): Cast second arg of connect(2) from
+ sockaddr_in * to sockaddr *.
+
Mon May 1 23:19:10 1995 Theodore Y. Ts'o (tytso@dcl)
* kadmin.c (main): Fix really broken way client and client_name
Index: kadmin.old/client/kadmin.c
===================================================================
RCS file: /usr/src/master/security/kerberos/src/kadmin.old/client/kadmin.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 kadmin.c
--- kadmin.c 1995/07/18 09:00:50 1.1.1.1
+++ kadmin.c 1995/07/18 09:44:24
@@ -588,7 +588,8 @@
return retval;
}
/* connect to the server */
- if (connect(*local_socket, &remote_sin, sizeof(remote_sin)) < 0) {
+ if (connect(*local_socket, (struct sockaddr *) &remote_sin,
+ sizeof(remote_sin)) < 0) {
retval = errno;
fprintf(stderr, "Cannot Connect to Socket!\n");
close(*local_socket);
Index: kadmin.old/kpasswd/ChangeLog
===================================================================
RCS file: /usr/src/master/security/kerberos/src/kadmin.old/kpasswd/ChangeLog,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ChangeLog
--- ChangeLog 1995/07/18 09:00:51 1.1.1.1
+++ ChangeLog 1995/07/18 09:44:56
@@ -1,3 +1,8 @@
+Tue Jul 18 09:44:36 1995 Michael Shields <shields@tembel.org>
+
+ * kpasswd.c (adm5_init_link): Cast second arg of connect(2) from
+ sockaddr_in * to sockaddr *.
+
Fri Mar 17 15:36:07 1995 Chris Provenzano (proven@mit.edu)
* kpasswd.c: Cast malloc() return value to shut compiler up.
Index: kadmin.old/kpasswd/kpasswd.c
===================================================================
RCS file: /usr/src/master/security/kerberos/src/kadmin.old/kpasswd/kpasswd.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 kpasswd.c
--- kpasswd.c 1995/07/18 09:00:51 1.1.1.1
+++ kpasswd.c 1995/07/18 09:44:57
@@ -799,7 +799,8 @@
return(1);
}
/* connect to the server */
- if (connect(*local_socket, &remote_sin, sizeof(remote_sin)) < 0) {
+ if (connect(*local_socket, (struct sockaddr *) &remote_sin,
+ sizeof(remote_sin)) < 0) {
fprintf(stderr, "Cannot Connect to Socket\n");
close(*local_socket);
return(1);
Index: kadmin.old/server/ChangeLog
===================================================================
RCS file: /usr/src/master/security/kerberos/src/kadmin.old/server/ChangeLog,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ChangeLog
--- ChangeLog 1995/07/18 09:00:51 1.1.1.1
+++ ChangeLog 1995/07/18 10:04:46
@@ -1,3 +1,8 @@
+Tue Jul 18 09:45:21 1995 Michael Shields <shields@tembel.org>
+
+ * adm_network.c (setup_network): Cast second arg of bind(2) from
+ sockaddr_in * to sockaddr *.
+
Wed May 03 03:30:51 1995 Chris Provenzano (proven@mit.edu)
* adm_process.c: (krb5_recvauth()): No longer needs the rc_type arg.
Index: kadmin.old/server/adm_network.c
===================================================================
RCS file: /usr/src/master/security/kerberos/src/kadmin.old/server/adm_network.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 adm_network.c
--- adm_network.c 1995/07/18 09:00:51 1.1.1.1
+++ adm_network.c 1995/07/18 10:04:45
@@ -266,7 +266,7 @@
}
if (bind(client_server_info.server_socket,
- &client_server_info.server_name,
+ (struct sockaddr *) &client_server_info.server_name,
sizeof(client_server_info.server_name)) < 0) {
retval = errno;
krb5_free_principal(context, client_server_info.server);
Index: lib/krb4/ChangeLog
===================================================================
RCS file: /usr/src/master/security/kerberos/src/lib/krb4/ChangeLog,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ChangeLog
--- ChangeLog 1995/07/18 06:23:23 1.1.1.1
+++ ChangeLog 1995/07/19 09:21:05
@@ -1,3 +1,13 @@
+Wed Jul 19 09:20:47 1995 Michael Shields <shields@tembel.org>
+
+ * cr_err_repl.c: Make req_act_vno intern, so as not to have an
+ unresolved symbol in the library.
+
+Tue Jul 18 08:38:48 1995 Michael Shields <shields@tembel.org>
+
+ * realmofhost.c (krb_realmofhost): Make lhost, domain const.
+ (krb_realmofhost): Indent parameter list, to make Emacs happy.
+
Thu May 4 10:03:22 1995 Tom Yu (tlyu@dragons-lair)
* put_svc_key.c (put_svc_key): remove spurious & in front of fkey
Index: lib/krb4/cr_err_repl.c
===================================================================
RCS file: /usr/src/master/security/kerberos/src/lib/krb4/cr_err_repl.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 cr_err_repl.c
--- cr_err_repl.c 1995/07/18 06:23:24 1.1.1.1
+++ cr_err_repl.c 1995/07/19 09:18:41
@@ -13,7 +13,7 @@
#include "prot.h"
#include <string.h>
-extern int req_act_vno; /* this is defined in the kerberos
+/*extern*/ int req_act_vno; /* this is defined in the kerberos
* server code */
/*
Index: lib/krb4/realmofhost.c
===================================================================
RCS file: /usr/src/master/security/kerberos/src/lib/krb4/realmofhost.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 realmofhost.c
--- realmofhost.c 1995/07/18 06:23:26 1.1.1.1
+++ realmofhost.c 1995/07/18 09:10:46
@@ -43,16 +43,16 @@
char * INTERFACE
krb_realmofhost(host)
-char *host;
+ char *host;
{
- char *domain;
+ const char *domain;
FILE *trans_file;
FILE *krb__get_realmsfile();
char trans_host[MAXHOSTNAMELEN+1];
char trans_realm[REALM_SZ+1];
int retval;
struct hostent *h;
- char *lhost;
+ const char *lhost;
/* First, canonicalize it. This is in case the caller
didn't have a fully qualified domain name. */
Index: slave/ChangeLog
===================================================================
RCS file: /usr/src/master/security/kerberos/src/slave/ChangeLog,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ChangeLog
--- ChangeLog 1995/07/18 06:24:13 1.1.1.1
+++ ChangeLog 1995/07/18 23:59:20
@@ -1,3 +1,11 @@
+Tue Jul 18 09:51:20 1995 Michael Shields <shields@tembel.org>
+
+ * configure.in: Add AC_C_CONST.
+
+ * kprop.c (get_tickets): Don't write into the buffer
+ gethostbyname(3) returns.
+ * kpropd.c (PRS): Ditto.
+
Wed May 03 03:30:51 1995 Chris Provenzano (proven@mit.edu)
* kpropd.c: (krb5_recvauth()): No longer needs the rc_type arg.
Index: slave/configure.in
===================================================================
RCS file: /usr/src/master/security/kerberos/src/slave/configure.in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 configure.in
--- configure.in 1995/07/18 06:24:13 1.1.1.1
+++ configure.in 1995/07/18 23:59:20
@@ -6,6 +6,7 @@
AC_HEADER_CHECK(termios.h,AC_FUNC_CHECK([tcsetattr],AC_DEFINE(POSIX_TERMIOS)))
WITH_NETLIB
AC_CHECK_LIB(util,main)
+AC_C_CONST
KRB_INCLUDE
WITH_KRB5ROOT
V5_AC_OUTPUT_MAKEFILE
Index: slave/kprop.c
===================================================================
RCS file: /usr/src/master/security/kerberos/src/slave/kprop.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 kprop.c
--- kprop.c 1995/07/18 06:24:14 1.1.1.1
+++ kprop.c 1995/07/18 10:17:37
@@ -189,6 +189,7 @@
char my_host_name[MAXHOSTNAMELEN];
char buf[BUFSIZ];
char *cp;
+ const char *ccp;
struct hostent *hp;
krb5_error_code retval;
static char tkstring[] = "/tmp/kproptktXXXXXX";
@@ -205,13 +206,13 @@
fprintf(stderr, "Couldn't get my cannonicalized host name!\n");
exit(1);
}
- for (cp=hp->h_name; *cp; cp++)
- if (isupper(*cp))
- *cp = tolower(*cp);
- if (realm)
- sprintf(buf, "host/%s@%s", hp->h_name, realm);
- else
- sprintf(buf, "host/%s", hp->h_name);
+ strcpy(buf, "host/");
+ for (ccp = hp->h_name, cp = buf+5; *ccp; ccp++, cp++)
+ *cp = isupper(*ccp) ? tolower(*ccp) : *ccp;
+ if (realm) {
+ *cp++ = '@';
+ strcpy(cp, realm);
+ }
if (retval = krb5_parse_name(context, buf, &my_principal)) {
com_err (progname, retval, "when parsing name %s",buf);
exit(1);
@@ -244,15 +245,13 @@
"Couldn't get cannonicalized name for slave\n");
exit(1);
}
- for (cp=hp->h_name; *cp; cp++)
- if (isupper(*cp))
- *cp = tolower(*cp);
if (!(slave_host = malloc(strlen(hp->h_name) + 1))) {
com_err(progname, ENOMEM,
"while allocate space for canonicalized slave host");
exit(1);
}
- strcpy(slave_host, hp->h_name);
+ for (ccp = hp->h_name, cp = slave_host; *ccp; ccp++, cp++)
+ *cp = isupper(*ccp) ? tolower(*ccp) : *ccp;
if (realm)
sprintf(buf, "%s/%s@%s", KPROP_SERVICE_NAME, slave_host,
realm);
Index: slave/kpropd.c
===================================================================
RCS file: /usr/src/master/security/kerberos/src/slave/kpropd.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 kpropd.c
--- kpropd.c 1995/07/18 06:24:14 1.1.1.1
+++ kpropd.c 1995/07/18 10:17:43
@@ -331,7 +331,8 @@
char **argv;
{
register char *word, ch;
- char *cp;
+ char *cp, *canonhostname;
+ const char *ccp;
struct hostent *hp;
char my_host_name[MAXHOSTNAMELEN], buf[BUFSIZ];
krb5_error_code retval;
@@ -424,14 +425,19 @@
fprintf(stderr, "Couldn't get my cannonicalized host name!\n");
exit(1);
}
- for (cp=hp->h_name; *cp; cp++)
- if (isupper(*cp))
- *cp = tolower(*cp);
+ if (!(canonhostname = malloc(strlen(hp->h_name) + 1))) {
+ com_err(progname, ENOMEM,
+ "while allocate space for canonicalized slave host");
+ exit(1);
+ }
+ for (ccp = hp->h_name, cp = canonhostname; *ccp; ccp++, cp++)
+ *cp = isupper(*ccp) ? tolower(*ccp) : *ccp;
if (realm)
- sprintf(buf, "%s/%s@%s", KPROP_SERVICE_NAME, hp->h_name,
+ sprintf(buf, "%s/%s@%s", KPROP_SERVICE_NAME, canonhostname,
realm);
else
- sprintf(buf, "%s/%s", KPROP_SERVICE_NAME, hp->h_name);
+ sprintf(buf, "%s/%s", KPROP_SERVICE_NAME, canonhostname);
+ free(canonhostname);
if (retval = krb5_parse_name(kpropd_context, buf, &server)) {
com_err(progname, retval,
"While trying to parse %s for service name");
--
Shields.
