+
+Tue Jun 27 16:18:49 EDT 1995 Paul Park (pjpark@mit.edu)
+ * configure.in - When checking number/type of arguments to {get,set}pgrp
+ attempt to set __STDC__ in a vain attempt to ensure that we
+ get function prototype checking turned on. OSF/1's native
+ compiler didn't really care what's passed as arguments unless
+ __STDC__'s set.
+ * krcp.c - Change usage of BUFSIZ to RCP_BUFSIZ. Remove & from in
+ front of array. It's redundant.
+ * krlogin.c - Change usage of BUFSIZ to RLOGIN_BUFSIZ. Add signal
+ name parameter to signal handlers to conform to prototype.
+ * krlogind.c - Change usage of BUFSIZ to RLOGIND_BUFSIZ. Cast 4th
+ argument to setsockopt(2) to be const char *.
+ * krsh.c - Change usage of BUFSIZ to RSH_BUFSIZ. Cast 4th argument
+ to setsockopt(2) to be const char *.
+ * krshd.c - Change usage of BUFSIZ to RSHD_BUFSIZ.
+
Thu Jun 22 14:36:46 1995 Theodore Y. Ts'o <tytso@dcl>
* configure.in: Change AC_HAVE_HEADERS with AC_CHECK_HEADERS, and
AC_MSG_CHECKING([arguments to getpgrp])
AC_CACHE_VAL(krb5_cv_getpgrp_args,
[AC_TRY_COMPILE(
-[#include <unistd.h>
+[#ifndef __STDC__
+#define __STDC__ 1
+#endif
+#include <unistd.h>
#include <sys/types.h>], [pid_t pid = getpgrp(getpid())],
krb5_cv_getpgrp_args=pid, krb5_cv_getpgrp_args=void)])
AC_MSG_RESULT($krb5_cv_getpgrp_args)
AC_MSG_CHECKING([number of arguments to setpgrp])
AC_CACHE_VAL(krb5_cv_setpgrp_args,
[AC_TRY_COMPILE(
-[#include <unistd.h>],[setpgrp(0,0)],
+[#ifndef __STDC__
+#define __STDC__ 1
+#endif
+#include <unistd.h>],[setpgrp(0,0)],
krb5_cv_setpgrp_args=two, krb5_cv_setpgrp_args=void)])
AC_MSG_RESULT($krb5_cv_setpgrp_args)
if test $krb5_cv_setpgrp_args = two; then
#include "krb5.h"
#include "com_err.h"
-#ifdef BUFSIZ
-#undef BUFSIZ
-#endif
-#define BUFSIZ 4096
+#define RCP_BUFSIZ 4096
int sock;
struct sockaddr_in foreign; /* set up by kcmd used by send_auth */
char *krb_realm = NULL;
char *krb_cache = NULL;
char *krb_config = NULL;
-char des_inbuf[2*BUFSIZ]; /* needs to be > largest read size */
-char des_outbuf[2*BUFSIZ]; /* needs to be > largest write size */
+char des_inbuf[2*RCP_BUFSIZ]; /* needs to be > largest read size */
+char des_outbuf[2*RCP_BUFSIZ]; /* needs to be > largest write size */
krb5_data desinbuf,desoutbuf;
krb5_encrypt_block eblock; /* eblock for encrypt/decrypt */
krb5_keyblock *session_key; /* static key for session */
char *suser, *tuser, *thost;
int i;
int cmdsiz = 30;
- char buf[BUFSIZ], cmdbuf[30];
+ char buf[RCP_BUFSIZ], cmdbuf[30];
char *cmd = cmdbuf;
struct servent *sp;
static char curhost[256];
struct buffer *bp;
int x, readerr, f, amt;
off_t i;
- char buf[BUFSIZ];
+ char buf[RCP_BUFSIZ];
for (x = 0; x < argc; x++) {
name = argv[x];
(void) close(f);
continue;
}
- if ((bp = allocbuf(&buffer, f, BUFSIZ)) == NULLBUF) {
+ if ((bp = allocbuf(&buffer, f, RCP_BUFSIZ)) == NULLBUF) {
(void) close(f);
continue;
}
#else
struct direct *dp;
#endif
- char buf[BUFSIZ];
+ char buf[RCP_BUFSIZ];
char *bufv[1];
if (d == 0) {
continue;
if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, ".."))
continue;
- if (strlen(name) + 1 + strlen(dp->d_name) >= BUFSIZ - 1) {
+ if (strlen(name) + 1 + strlen(dp->d_name) >= RCP_BUFSIZ - 1) {
error("%s/%s: Name too long.\n", name, dp->d_name);
continue;
}
response()
{
- char resp, c, rbuf[BUFSIZ], *cp = rbuf;
+ char resp, c, rbuf[RCP_BUFSIZ], *cp = rbuf;
if (des_read(rem, &resp, 1) != 1)
lostconn();
switch (resp) {
if (des_read(rem, &c, 1) != 1)
lostconn();
*cp++ = c;
- } while (cp < &rbuf[BUFSIZ] && c != '\n');
+ } while (cp < &rbuf[RCP_BUFSIZ] && c != '\n');
if (iamremote == 0)
(void) write(2, rbuf, cp - rbuf);
errs++;
struct stat stb;
int targisdir = 0;
char *myargv[1];
- char cmdbuf[BUFSIZ], nambuf[BUFSIZ];
+ char cmdbuf[RCP_BUFSIZ], nambuf[RCP_BUFSIZ];
int setimes = 0;
struct timeval tv[2];
#define atime tv[0]
#endif
}
ga();
- if ((bp = allocbuf(&buffer, of, BUFSIZ)) == NULLBUF) {
+ if ((bp = allocbuf(&buffer, of, RCP_BUFSIZ)) == NULLBUF) {
(void) close(of);
continue;
}
cp = bp->buf;
count = 0;
wrerr = 0;
- for (i = 0; i < size; i += BUFSIZ) {
- amt = BUFSIZ;
+ for (i = 0; i < size; i += RCP_BUFSIZ) {
+ amt = RCP_BUFSIZ;
if (i + amt > size)
amt = size - i;
count += amt;
char *fmt;
int a1, a2, a3, a4, a5;
{
- char buf[BUFSIZ], *cp = buf;
+ char buf[RCP_BUFSIZ], *cp = buf;
errs++;
*cp++ = 1;
-char storage[2*BUFSIZ]; /* storage for the decryption */
+char storage[2*RCP_BUFSIZ]; /* storage for the decryption */
int nstored = 0;
char *store_ptr = storage;
nstored = 0;
}
- if ((cc = krb5_net_read(bsd_context, fd, (char *)&len_buf, 4)) != 4) {
+ if ((cc = krb5_net_read(bsd_context, fd, (char *)len_buf, 4)) != 4) {
/* XXX can't read enough, pipe must have closed */
return(0);
}
#include "com_err.h"
#include "defines.h"
-#ifdef BUFSIZ
-#undef BUFSIZ
-#endif
-#define BUFSIZ 4096
+#define RLOGIN_BUFSIZ 4096
-char des_inbuf[2*BUFSIZ]; /* needs to be > largest read size */
-char des_outbuf[2*BUFSIZ]; /* needs to be > largest write size */
+char des_inbuf[2*RLOGIN_BUFSIZ]; /* needs to be > largest read size */
+char des_outbuf[2*RLOGIN_BUFSIZ]; /* needs to be > largest write size */
krb5_data desinbuf,desoutbuf;
krb5_encrypt_block eblock; /* eblock for encrypt/decrypt */
char *host=0; /* external, so it can be
reached from confirm_death() */
-krb5_sigtype sigwinch(), oob();
-krb5_sigtype lostpeer();
+krb5_sigtype sigwinch KRB5_PROTOTYPE((int)), oob KRB5_PROTOTYPE((int));
+krb5_sigtype lostpeer KRB5_PROTOTYPE((int));
#if __STDC__
int setsignal(int sig, krb5_sigtype (*act)());
#endif
#define CRLF "\r\n"
int child;
-krb5_sigtype catchild();
-krb5_sigtype copytochild(), writeroob();
+krb5_sigtype catchild KRB5_PROTOTYPE((int));
+krb5_sigtype copytochild KRB5_PROTOTYPE((int)),
+ writeroob KRB5_PROTOTYPE((int));
int defflags, tabflag;
int deflflags;
* Copy SIGURGs to the child process.
*/
krb5_sigtype
- copytochild()
+ copytochild(signo)
+int signo;
{
(void) kill(child, SIGURG);
}
* request to turn on the window-changing protocol.
*/
krb5_sigtype
- writeroob()
+ writeroob(signo)
+int signo;
{
#ifdef POSIX_SIGNALS
struct sigaction sa;
krb5_sigtype
- catchild()
+ catchild(signo)
+int signo;
{
#ifdef WAIT_USES_INT
int status;
#endif
mode(1);
- sigwinch(); /* check for size changes */
+ sigwinch(SIGWINCH); /* check for size changes */
}
krb5_sigtype
- sigwinch()
+ sigwinch(signo)
+int signo;
{
struct winsize ws;
#endif
krb5_sigtype
- oob()
+ oob(signo)
+int signo;
{
#ifndef POSIX_TERMIOS
int out = FWRITE;
#endif
int atmark, n;
int rcvd = 0;
- char waste[BUFSIZ], mark;
+ char waste[RLOGIN_BUFSIZ], mark;
#ifdef POSIX_TERMIOS
struct termios tty;
#else
-char storage[2*BUFSIZ]; /* storage for the decryption */
+char storage[2*RLOGIN_BUFSIZ]; /* storage for the decryption */
int nstored = 0;
char *store_ptr = storage;
-krb5_sigtype lostpeer()
+krb5_sigtype lostpeer(signo)
+ int signo;
{
#ifdef POSIX_SIGNALS
struct sigaction sa;
#include "krb5.h"
#include <kerberosIV/krb.h>
-#ifdef BUFSIZ
-#undef BUFSIZ
-#endif
-
int auth_sys = 0; /* Which version of Kerberos used to authenticate */
#define KRB5_RECVAUTH_V4 4
Key_schedule v4_schedule;
int v4_des_read(), v4_des_write();
-#define BUFSIZ 5120
+#define RLOGIND_BUFSIZ 5120
int v5_des_read(), v5_des_write();
#define SECURE_MESSAGE "This rlogin session is using DES encryption for all data transmissions.\r\n"
int (*des_read)(), (*des_write)();
-char des_inbuf[2*BUFSIZ]; /* needs to be > largest read size */
-char des_outbuf[2*BUFSIZ]; /* needs to be > largest write size */
+char des_inbuf[2*RLOGIND_BUFSIZ]; /* needs to be > largest read size */
+char des_outbuf[2*RLOGIND_BUFSIZ];/* needs to be > largest write size */
krb5_data desinbuf,desoutbuf;
krb5_encrypt_block eblock; /* eblock for encrypt/decrypt */
fd = 0;
}
- if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof (on)) < 0)
+ if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE,
+ (const char *) &on, sizeof (on)) < 0)
syslog(LOG_WARNING, "setsockopt (SO_KEEPALIVE): %m");
doit(fd, &from);
-char storage[2*BUFSIZ]; /* storage for the decryption */
+char storage[2*RLOGIND_BUFSIZ]; /* storage for the decryption */
int nstored = 0;
char *store_ptr = storage;
#ifndef UCB_RSH
#define UCB_RSH "/usr/ucb/rsh"
#endif
-#ifdef BUFSIZ
-#undef BUFSIZ
-#endif
-#define BUFSIZ 4096
-char des_inbuf[2*BUFSIZ]; /* needs to be > largest read size */
-char des_outbuf[2*BUFSIZ]; /* needs to be > largest write size */
+#define RSH_BUFSIZ 4096
+
+char des_inbuf[2*RSH_BUFSIZ]; /* needs to be > largest read size */
+char des_outbuf[2*RSH_BUFSIZ]; /* needs to be > largest write size */
krb5_data desinbuf,desoutbuf;
krb5_encrypt_block eblock; /* eblock for encrypt/decrypt */
krb5_context bsd_context;
char **argv0;
{
int rem, pid;
- char *host=0, *cp, **ap, buf[BUFSIZ], *args, **argv = argv0, *user = 0;
+ char *host=0, *cp, **ap, buf[RSH_BUFSIZ], *args, **argv = argv0, *user = 0;
register int cc;
struct passwd *pwd;
fd_set readfrom, ready;
exit(2);
}
if (options & SO_DEBUG) {
- if (setsockopt(rem, SOL_SOCKET, SO_DEBUG, &one, sizeof (one)) < 0)
+ if (setsockopt(rem, SOL_SOCKET, SO_DEBUG,
+ (const char *) &one, sizeof (one)) < 0)
perror("setsockopt (stdin)");
- if (setsockopt(rfd2, SOL_SOCKET, SO_DEBUG, &one, sizeof (one)) < 0)
+ if (setsockopt(rfd2, SOL_SOCKET, SO_DEBUG,
+ (const char *) &one, sizeof (one)) < 0)
perror("setsockopt (stderr)");
}
(void) setuid(getuid());
}
-char storage[2*BUFSIZ];
+char storage[2*RSH_BUFSIZ];
int nstored = 0;
char *store_ptr = storage;
#define SECURE_MESSAGE "This rsh session is using DES encryption for all data transmissions.\r\n"
-#ifdef BUFSIZ
-#undef BUFSIZ
-#endif
-#define BUFSIZ 5120
+#define RSHD_BUFSIZ 5120
#define MAXRETRIES 4
-char des_inbuf[2*BUFSIZ]; /* needs to be > largest read size */
+char des_inbuf[2*RSHD_BUFSIZ]; /* needs to be > largest read size */
krb5_encrypt_block eblock; /* eblock for encrypt/decrypt */
-char des_outbuf[2*BUFSIZ]; /* needs to be > largest write size */
+char des_outbuf[2*RSHD_BUFSIZ]; /* needs to be > largest write size */
krb5_data desinbuf,desoutbuf;
krb5_context bsd_context;
char *srvtab = NULL;
short port;
int pv[2], pw[2], px[2], cc;
fd_set ready, readfrom;
- char buf[BUFSIZ], sig;
+ char buf[RSHD_BUFSIZ], sig;
int one = 1;
krb5_sigtype cleanup();
int fd;
char *fmt;
char *a1, *a2, *a3;
{
- char buf[BUFSIZ];
+ char buf[RSHD_BUFSIZ];
buf[0] = 1;
(void) sprintf(buf+1, "%s: ", progname);
}
-char storage[2*BUFSIZ]; /* storage for the decryption */
+char storage[2*RSHD_BUFSIZ]; /* storage for the decryption */
int nstored = 0;
char *store_ptr = storage;
+
+Tue Jun 27 16:16:18 EDT 1995 Paul Park (pjpark@mit.edu)
+ * enc_des.c, encrypt.c, krb4encpwd.c, read_password.c, rsaencpwd.c,
+ spx.c - Give the compiler something to compile when these
+ modules are essentially disabled. Some compilers choke when
+ there's nothing to compile.
+ * setenv.c - Change prototype for __findenv to be static since it's
+ really static.
+
Tue Jun 20 13:59:43 1995 Tom Yu (tlyu@dragons-lair)
* configure.in: fix typo
}
# endif /* DES_ENCRYPTION */
# endif /* AUTHENTICATION */
+#else /* ENCRYPTION */
+#include "misc-proto.h"
#endif /* ENCRYPTION */
else
encrypt_gen_printsub(data, cnt, buf, buflen);
}
+#else /* ENCRYPTION */
+#include "misc-proto.h"
#endif /* ENCRYPTION */
} else passwdok_status = 0;
return(passwdok_status);
}
-
+#else
+#include "misc-proto.h"
#endif
#ifdef notdef
s[max-1] = 0; /* force termination */
return !ok; /* return nonzero if not okay */
}
+#else /* defined(RSA_ENCPWD) || defined(KRB4_ENCPWD) */
+#include "misc-proto.h"
#endif /* defined(RSA_ENCPWD) || defined(KRB4_ENCPWD) */
} else passwdok_status = 0;
return(passwdok_status);
}
-
+#else
+#include "misc-proto.h"
#endif
#ifdef notdef
#ifndef __P
#define __P(x) ()
#endif
-char *__findenv __P((const char *, int *));
+static char *__findenv __P((const char *, int *));
/*
* setenv --
break;
}
}
-
+#else
+#include "misc-proto.h"
#endif
#ifdef notdef
krb5_error_code krb5_aprof_init
KRB5_PROTOTYPE((char *, char *, krb5_pointer *));
krb5_error_code krb5_aprof_getvals
- KRB5_PROTOTYPE((krb5_pointer, char **, char ***));
+ KRB5_PROTOTYPE((krb5_pointer, const char **, char ***));
krb5_error_code krb5_aprof_get_deltat
- KRB5_PROTOTYPE((krb5_pointer, char **, krb5_boolean, krb5_deltat *));
+ KRB5_PROTOTYPE((krb5_pointer,
+ const char **,
+ krb5_boolean,
+ krb5_deltat *));
krb5_error_code krb5_aprof_get_string
- KRB5_PROTOTYPE((krb5_pointer, char **, krb5_boolean, char **));
+ KRB5_PROTOTYPE((krb5_pointer, const char **, krb5_boolean, char **));
krb5_error_code krb5_aprof_get_int32
- KRB5_PROTOTYPE((krb5_pointer, char **, krb5_boolean, krb5_int32 *));
+ KRB5_PROTOTYPE((krb5_pointer,
+ const char **,
+ krb5_boolean,
+ krb5_int32 *));
krb5_error_code krb5_aprof_finish KRB5_PROTOTYPE((krb5_pointer));
#endif /* KRB5_ADM_PROTO_H__ */
+Tue Jun 27 16:10:19 EDT 1995 Paul Park (pjpark@mit.edu)
+ * adm_parse.c - Give compiler something to compile if SANDIA is not
+ defined. Some compilers choke when nothing to compile.
+ * adm_process.c - Cast 4th argument of setsockopt(2) to be const char *
+
+
Thu Jun 22 11:54:31 EDT 1995 Paul Park (pjpark@mit.edu)
* adm_server.c - Change KDB_CONVERT_KEY_OUTOF_DB to decrypt_key call.
return;
}
}
+#else
+/* Need something to compile. */
+#include <stdio.h>
#endif
outbuf.data = retbuf;
if (setsockopt(client_server_info.client_socket,
- SOL_SOCKET, SO_KEEPALIVE, &on, sizeof(on)) < 0) {
+ SOL_SOCKET, SO_KEEPALIVE,
+ (const char *) &on, sizeof(on)) < 0) {
syslog(LOG_ERR, "adm_process: setsockopt keepalive: %d", errno);
}
+
+Tue Jun 27 16:05:27 EDT 1995 Paul Park (pjpark@mit.edu)
+ * acl_files.c - Change check for return value from fputs(3) from NULL
+ to EOF. That's what's returned on error.
+ * admin_server.c - Cast 4th argument of setsockopt(2) to be const char *
+ * kadm_funcs.c - Cast argument to ctime(3)
+ * kadm_server.c - Cast first argument to strcpy(3) and strcat(3).
+
Tue Jun 20 14:44:54 1995 Tom Yu (tlyu@dragons-lair)
* configure.in: add tests for TIME_WITH_SYS_TIME and sys/time.h
des_init_random_number_generator(server_parm.master_keyblock.contents);
#endif /* NOENCRYPTION */
- if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof(on)) < 0)
+ if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE,
+ (const char *) &on, sizeof(on)) < 0)
syslog(LOG_ERR, "setsockopt keepalive: %d", errno);
server_parm.recv_addr = *who;
if (retval)
return retval;
princ->exp_date = entry.expiration;
- strncpy(ctime(&entry.expiration), princ->exp_date_txt,
+ strncpy(ctime((const time_t *) &entry.expiration), princ->exp_date_txt,
DATE_SZ);
princ->mod_date = entry.mod_date;
- strncpy(ctime(&entry.mod_date), princ->mod_date_txt,
+ strncpy(ctime((const time_t *) &entry.mod_date), princ->mod_date_txt,
DATE_SZ);
princ->attributes = entry.attributes;
princ->max_life = entry.max_life / (60 * 5);
if (fascist_cpw) {
*outlen = strlen(bad_pw_err)+strlen(pw_blurb)+1;
if (*datout = (u_char *) malloc(*outlen)) {
- strcpy(*datout, bad_pw_err);
- strcat(*datout, pw_blurb);
+ strcpy((char *) *datout, bad_pw_err);
+ strcat((char *) *datout, pw_blurb);
} else
*outlen = 0;
(void) krb_log("'%s.%s@%s' tried to use an insecure password in changepw",
} else {
*outlen = strlen(bad_pw_warn) + strlen(pw_blurb)+1;
if (*datout = (u_char *) malloc(*outlen)) {
- strcpy(*datout, bad_pw_warn);
- strcat(*datout, pw_blurb);
+ strcpy((char *) *datout, bad_pw_warn);
+ strcat((char *) *datout, pw_blurb);
} else
*outlen = 0;
(void) krb_log("'%s.%s@%s' used an insecure password in changepw",
if (retval) {
*outlen = strlen(check_pw_msg)+strlen(pw_blurb)+1;
if (*datout = (u_char *) malloc(*outlen)) {
- strcpy(*datout, check_pw_msg);
- strcat(*datout, pw_blurb);
+ strcpy((char *) *datout, check_pw_msg);
+ strcat((char *) *datout, pw_blurb);
} else
*outlen = 0;
(void) krb_log("'%s.%s@%s' sent an insecure password to be checked",
+Tue Jun 27 16:02:24 EDT 1995 Paul Park (pjpark@mit.edu)
+ * srv_net.c, srv_acl.c, proto_serv.c - Add signal name parameter to
+ signal handlers to conform to prototype.
+
Thu Jun 15 17:54:31 EDT 1995 Paul Park (pjpark@mit.edu)
* Makefile.in - Change explicit library names to -l<lib> form, and
change target link line to use $(LD) and associated flags.
static jmp_buf timeout_jmp;
static krb5_sigtype
-proto_alarmclock()
+proto_alarmclock(signo)
+ int signo;
{
#if POSIX_SETJMP
siglongjmp(timeout_jmp, 1);
* acl_reload_acl_file() - Reload the acl file.
*/
static krb5_sigtype
-acl_reload_acl_file()
+acl_reload_acl_file(signo)
+ int signo;
{
- DPRINT(DEBUG_CALLS, acl_debug_level, ("* acl_reload_acl_file()\n"));
+ DPRINT(DEBUG_CALLS, acl_debug_level, ("* acl_reload_acl_file(%d)\n",
+ signo));
acl_free_entries();
acl_inited = acl_load_acl_file();
DPRINT(DEBUG_CALLS, acl_debug_level, ("X acl_reload_acl_file()\n"));
* net_shutdown() - Destroy all slaves on signal reception
*/
static krb5_sigtype
-net_shutdown()
+net_shutdown(signo)
+ int signo;
{
int i;
* net_reaper() - Child process termination handler.
*/
static krb5_sigtype
-net_reaper()
+net_reaper(signo)
+ int signo;
{
#ifdef WAIT_USES_INT
int child_exit;
+Tue Jun 27 15:59:48 EDT 1995 Paul Park (pjpark@mit.edu)
+ * main.c - Change profile name hierarchy storage to const char *. Add
+ signal name argument to signal handler to conform to prototype.
+ * kerberos_v4.c - Cast key to (char *) to conform to prototype.
+
+
Thu Jun 22 15:24:16 EDT 1995 Paul Park (pjpark@mit.edu)
* main.c - Change option parsing logic to support multiple realms.
Use alternate profile routines from libkadm to support reading
/* construct and seal the ticket */
krb_create_ticket(tk, k_flags, a_name_data.name,
a_name_data.instance, local_realm,
- client_host.s_addr, session_key, lifetime, kerb_time.tv_sec,
+ client_host.s_addr, (char *) session_key, lifetime, kerb_time.tv_sec,
s_name_data.name, s_name_data.instance, key);
memset(key, 0, sizeof(key));
memset(key_s, 0, sizeof(key_s));
krb_create_ticket(tk, k_flags, ad->pname, ad->pinst,
ad->prealm, client_host.s_addr,
- session_key, lifetime, kerb_time.tv_sec,
+ (char *) session_key, lifetime, kerb_time.tv_sec,
s_name_data.name, s_name_data.instance,
key);
memset(key, 0, sizeof(key));
memcpy(((KRB4_32 *) key) + 1, &p->key_high, 4);
kdb_encrypt_key(key, key, master_key,
master_key_schedule, DECRYPT);
- krb_set_key(key, 0);
+ krb_set_key((char *) key, 0);
strcpy(lastrealm, r);
return (KSUCCESS);
}
krb5_boolean def_manual;
{
krb5_error_code kret;
- char *hierarchy[4];
+ const char *hierarchy[4];
krb5_boolean manual;
krb5_db_entry db_entry;
int num2get;
}
krb5_sigtype
-request_exit()
+request_exit(signo)
+ int signo;
{
signal_requests_exit = 1;
+Tue Jun 27 15:54:57 EDT 1995 Paul Park (pjpark@mit.edu)
+ * cnv_tkt_skey.c - Cast key contents argument to conform to prototype.
+ * encode.c - Cast argument to match argument list of encode_bytes().
+ * krb524d.c - Add signal name argument to conform to prototype.
+ * sendmsg.c - Cast second argument to connect(2).
+ * test.c - Cast arguments to print_key() and ctime(3). Cast assignment
+ to key.contents.
+
+
Thu Jun 22 11:55:23 EDT 1995 Paul Park (pjpark@mit.edu)
* krb524d.c - Change KRB_CONVERT_KEY_OUTOF_DB to decrypt_key calls.
pinst,
prealm,
*((unsigned long *)v5etkt->caddrs[0]->contents),
- v5etkt->session->contents,
+ (char *) v5etkt->session->contents,
lifetime,
/* issue_data */
v5etkt->times.starttime,
if ((ret = encode_int32(&buf, &buflen, &v4tkt->length)))
return ret;
- if ((ret = encode_bytes(&buf, &buflen, v4tkt->dat, MAX_KTXT_LEN)))
+ if ((ret = encode_bytes(&buf, &buflen, (char *)v4tkt->dat, MAX_KTXT_LEN)))
return ret;
if ((ret = encode_int32(&buf, &buflen, (krb5_int32 *) &v4tkt->mbz)))
return ret;
buflen = *encoded_len;
if ((ret = decode_int32(&buf, &buflen, &v4tkt->length)))
return ret;
- if ((ret = decode_bytes(&buf, &buflen, v4tkt->dat, MAX_KTXT_LEN)))
+ if ((ret = decode_bytes(&buf, &buflen, (char *)v4tkt->dat, MAX_KTXT_LEN)))
return ret;
if ((ret = decode_int32(&buf, &buflen, (krb5_int32 *) &v4tkt->mbz)))
return ret;
cleanup_and_exit(1, NULL);
}
-RETSIGTYPE request_exit()
+RETSIGTYPE request_exit(signo)
+ int signo;
{
signalled = 1;
}
* recvfrom. The connect here may return an error if the
* destination host is known to be unreachable.
*/
- if (connect(s, addr, sizeof(struct sockaddr)) == -1) {
+ if (connect(s, (struct sockaddr *) addr, sizeof(struct sockaddr)) == -1) {
retval = errno;
goto out;
}
printf("Ticket: Client: %s.%s@%s\n", pname, pinst, prealm);
printf("Ticket: Service: %s.%s\n", sname, sinst);
printf("Ticket: Address: %08lx\n", addr);
- print_key("Ticket: Session Key", session_key);
+ print_key("Ticket: Session Key", (char *) session_key);
printf("Ticket: Lifetime: %d\n", life);
- printf("Ticket: Issue Date: %ld, %s", issue_time, ctime(&issue_time));
+ printf("Ticket: Issue Date: %ld, %s", issue_time, ctime((time_t *)
+ &issue_time));
}
void krb4_print_creds(CREDENTIALS *creds, krb5_keyblock *secret_key)
creds->realm);
printf("Service: %s.%s@%s\n", creds->service, creds->instance,
creds->realm);
- print_key("Session key", creds->session);
+ print_key("Session key", (char *) creds->session);
printf("Lifetime: %d\n", creds->lifetime);
printf("Key Version: %d\n", creds->kvno);
print_time("Issue Date", creds->issue_date);
key.keytype = KEYTYPE_DES;
key.length = KEYSIZE; /* presumably */
- key.contents = keybuf;
+ key.contents = (krb5_octet *) keybuf;
do_remote(context, v5creds, remote, &key);
exit(0);
+
+Tue Jun 27 15:51:10 EDT 1995 Paul Park (pjpark@mit.edu)
+ * util.c - Make #endif ansi-compliant.
+ * read_passwd.c - Add signal name parameter to signal handler to
+ conform to prototype.
+
Mon Jun 26 14:39:18 1995 Sam Hartman <hartmans@tardis.MIT.EDU>
* Makefile.in (LDFLAGS): Removed bogus -g. It breaks on shared
static jmp_buf pwd_jump;
static krb5_sigtype
-intr_routine()
+intr_routine(signo)
+ int signo;
{
longjmp(pwd_jump, 1);
/*NOTREACHED*/
#ifndef lint
static char rcsid_util_c[] =
"$Header$";
-#endif lint
+#endif /* lint */
#include <stdio.h>
+Tue Jun 27 15:50:31 EDT 1995 Paul Park (pjpark@mit.edu)
+ * alt_prof.c - Change filename and hierarchy lists to be const char.
+
+
Thu Jun 22 11:56:15 EDT 1995 Paul Park (pjpark@mit.edu)
* alt_prof.c - New jacket routines for handling profiles. This includes
the ability to parse certain string values to appropriate types
krb5_pointer *acontextp;
{
krb5_error_code kret;
- char *namelist[2];
+ const char *namelist[2];
profile_t profile;
extern char *getenv PROTOTYPE((char *));
krb5_error_code
krb5_aprof_getvals(acontext, hierarchy, retdata)
krb5_pointer acontext;
- char **hierarchy;
+ const char **hierarchy;
char ***retdata;
{
return(profile_get_values((profile_t) acontext,
krb5_error_code
krb5_aprof_get_deltat(acontext, hierarchy, uselast, deltatp)
krb5_pointer acontext;
- char **hierarchy;
+ const char **hierarchy;
krb5_boolean uselast;
krb5_deltat *deltatp;
{
krb5_error_code
krb5_aprof_get_string(acontext, hierarchy, uselast, stringp)
krb5_pointer acontext;
- char **hierarchy;
+ const char **hierarchy;
krb5_boolean uselast;
char **stringp;
{
krb5_error_code
krb5_aprof_get_int32(acontext, hierarchy, uselast, intp)
krb5_pointer acontext;
- char **hierarchy;
+ const char **hierarchy;
krb5_boolean uselast;
krb5_int32 *intp;
{
+
+Tue Jun 27 15:49:35 EDT 1995 Paul Park (pjpark@mit.edu)
+ * kparse.c - Change LineNbr to sLineNbr to avoid conflict with kparse.h
+
Mon Jun 26 14:58:02 1995 Sam Hartman <hartmans@tardis.MIT.EDU>
* log.c: Use HAVE_TIME_H not NEED_TIME_H
static char *strsave();
#endif
-static int LineNbr=1; /* current line nbr in parameter file */
+static int sLineNbr=1; /* current line nbr in parameter file */
static char ErrorMsg[80]; /* meaningful only when KV_SYNTAX, PS_SYNTAX,
* or PS_BAD_KEYWORD is returned by
* fGetKeywordValue or fGetParameterSet */
int ch;
FILE *fp;
{
- if (ch=='\n') LineNbr--;
+ if (ch=='\n') sLineNbr--;
return(ungetc(ch,fp));
}
FILE *fp;
{
int ch = fgetc(fp);
- if (ch=='\n') LineNbr++;
+ if (ch=='\n') sLineNbr++;
return(ch);
}
switch (rc) {
case KV_EOL:
- printf("%s, line %d: nada mas.\n",filename,LineNbr-1);
+ printf("%s, line %d: nada mas.\n",filename,sLineNbr-1);
break;
case KV_SYNTAX:
printf("%s, line %d: syntax error: %s\n",
- filename,LineNbr,ErrorMsg);
+ filename,sLineNbr,ErrorMsg);
while ( ((ch=fGetChar(fp))!=EOF) && (ch!='\n') );
break;
case KV_OKAY:
printf("%s, line %d: okay, %s=\"%s\"\n",
- filename,LineNbr,key,valu);
+ filename,sLineNbr,key,valu);
break;
default:
switch (rc) {
case PS_BAD_KEYWORD:
- printf("%s, line %d: %s\n",filename,LineNbr,ErrorMsg);
+ printf("%s, line %d: %s\n",filename,sLineNbr,ErrorMsg);
while ( ((ch=fGetChar(fp))!=EOF) && (ch!='\n') );
break;
case PS_SYNTAX:
printf("%s, line %d: syntax error: %s\n",
- filename,LineNbr,ErrorMsg);
+ filename,sLineNbr,ErrorMsg);
while ( ((ch=fGetChar(fp))!=EOF) && (ch!='\n') );
break;
case PS_OKAY:
printf("%s, line %d: valid parameter set found:\n",
- filename,LineNbr-1);
+ filename,sLineNbr-1);
for (i=0; i<PARMCOUNT(kparm); i++) {
printf("\t%s = \"%s\"\n",kparm[i].keyword,
(kparm[i].value ? kparm[i].value
+
+Tue Jun 27 15:48:41 EDT 1995 Paul Park (pjpark@mit.edu)
+ * read_pwd.c(intr_routine) - Add signal name argument to signal handler
+ to conform to prototype.
+
Sat Jun 10 23:07:27 1995 Tom Yu (tlyu@dragons-lair)
* genaddrs.c: krb5_auth_context redefinitions
static jmp_buf pwd_jump;
static krb5_sigtype
-intr_routine()
+intr_routine(signo)
+ int signo;
{
longjmp(pwd_jump, 1);
/*NOTREACHED*/
+
+Tue Jun 27 15:47:56 EDT 1995 Paul Park (pjpark@mit.edu)
+ * hash.c - Cast 2nd argument to memmove to (char *).
+
Fri Jun 9 18:59:55 1995 <tytso@rsx-11.mit.edu>
* configure.in: Remove standardized set of autoconf macros, which
register void *p;
if (p = malloc(newsize)) {
- memmove(p, *p_ptr, oldsize);
+ memmove(p, (char *) *p_ptr, oldsize);
memset((char *)p + oldsize, 0, newsize - oldsize);
free(*p_ptr);
*p_ptr = p;
+
+Tue Jun 27 15:46:06 EDT 1995 Paul Park (pjpark@mit.edu)
+ * listen.c(listen_int_handler) - Add argument to conform to signal
+ handler prototype.
+
Tue Jun 13 01:48:33 1995 Tom Yu (tlyu@dragons-lair)
* Makefile.in: don't install libss.a
(void) fflush(stdout);
}
-static RETSIGTYPE listen_int_handler()
+static RETSIGTYPE listen_int_handler(signo)
+ int signo;
{
putc('\n', stdout);
longjmp(listen_jmpb, 1);
projects / krb5.git / commitdiff