oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

removed prog. Use err & c:o

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1528 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-03-30 17:38:11 +00:00
parent 1a97148b20
commit b201d1fd93
3 changed files with 56 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
appl/kx/common.c
View File

@@ -61,8 +61,8 @@ do_enccopy (int fd1, int fd2, int mode, des_cblock *iv,
if (ret == 0) if (ret == 0)
return 0; return 0;
if (ret < 0) { if (ret < 0) {
fprintf (stderr, "%s: read: %s\n", prog, strerror (errno)); warn ("read");
return ret; return ret;
} }
#ifndef NOENCRYPTION #ifndef NOENCRYPTION
des_cfb64_encrypt (buf, buf, ret, schedule, iv, des_cfb64_encrypt (buf, buf, ret, schedule, iv,
@@ -70,8 +70,8 @@ do_enccopy (int fd1, int fd2, int mode, des_cblock *iv,
#endif #endif
ret = krb_net_write (fd2, buf, ret); ret = krb_net_write (fd2, buf, ret);
if (ret < 0) { if (ret < 0) {
fprintf (stderr, "%s: write: %s\n", prog, strerror (errno)); warn ("write");
return ret; return ret;
} }
return 1; return 1;
} }
@@ -100,8 +100,8 @@ copy_encrypted (int fd1, int fd2, des_cblock *iv,
ret = select (max(fd1, fd2)+1, &fdset, NULL, NULL, NULL); ret = select (max(fd1, fd2)+1, &fdset, NULL, NULL, NULL);
if (ret < 0 && errno != EINTR) { if (ret < 0 && errno != EINTR) {
fprintf (stderr, "%s: select: %s\n", prog, strerror (errno)); warn ("select");
return 1; return 1;
} }
if (FD_ISSET(fd1, &fdset)) { if (FD_ISSET(fd1, &fdset)) {
ret = do_enccopy (fd1, fd2, DES_ENCRYPT, &iv1, schedule, &num1); ret = do_enccopy (fd1, fd2, DES_ENCRYPT, &iv1, schedule, &num1);
@@ -155,10 +155,8 @@ get_xsockets (int *unix_socket, int *tcp_socket)
for(dpy = 4; dpy < 256; ++dpy) { for(dpy = 4; dpy < 256; ++dpy) {
unixfd = socket (AF_UNIX, SOCK_STREAM, 0); unixfd = socket (AF_UNIX, SOCK_STREAM, 0);
if (unixfd < 0) { if (unixfd < 0)
fprintf (stderr, "%s: socket: %s\n", prog, strerror(errno)); err (1, "socket AF_UNIX");
return -1;
}
memset (&unixaddr, 0, sizeof(unixaddr)); memset (&unixaddr, 0, sizeof(unixaddr));
unixaddr.sun_family = AF_UNIX; unixaddr.sun_family = AF_UNIX;
sprintf (unixaddr.sun_path, X_UNIX_PATH "%u", dpy); sprintf (unixaddr.sun_path, X_UNIX_PATH "%u", dpy);
@@ -177,12 +175,8 @@ get_xsockets (int *unix_socket, int *tcp_socket)
int one = 1; int one = 1;
tcpfd = socket (AF_INET, SOCK_STREAM, 0); tcpfd = socket (AF_INET, SOCK_STREAM, 0);
if (tcpfd < 0) { if (tcpfd < 0)
fprintf (stderr, "%s: socket: %s\n", prog, err (1, "socket AF_INET");
strerror(errno));
close (unixfd);
return -1;
}
#if defined(TCP_NODELAY) && defined(HAVE_SETSOCKOPT) #if defined(TCP_NODELAY) && defined(HAVE_SETSOCKOPT)
setsockopt (tcpfd, IPPROTO_TCP, TCP_NODELAY, (void *)&one, setsockopt (tcpfd, IPPROTO_TCP, TCP_NODELAY, (void *)&one,
sizeof(one)); sizeof(one));
@@ -203,21 +197,13 @@ get_xsockets (int *unix_socket, int *tcp_socket)
} }
break; break;
} }
if (dpy == 256) { if (dpy == 256)
fprintf (stderr, "%s: no free x-servers\n", prog); errx ("no free x-servers");
return -1; if (listen (unixfd, SOMAXCONN) < 0)
} err (1, "listen");
if (listen (unixfd, SOMAXCONN) < 0) {
fprintf (stderr, "%s: listen: %s\n", prog,
strerror(errno));
return -1;
}
if (tcp_socket) if (tcp_socket)
if (listen (tcpfd, SOMAXCONN) < 0) { if (listen (tcpfd, SOMAXCONN) < 0)
fprintf (stderr, "%s: listen: %s\n", prog, err (1, "listen");
strerror(errno));
return -1;
}
strcpy(x_socket, unixaddr.sun_path); strcpy(x_socket, unixaddr.sun_path);
*unix_socket = unixfd; *unix_socket = unixfd;
if (tcp_socket) if (tcp_socket)
@@ -236,17 +222,12 @@ connect_local_xsocket (unsigned dnr)
struct sockaddr_un addr; struct sockaddr_un addr;
fd = socket (AF_UNIX, SOCK_STREAM, 0); fd = socket (AF_UNIX, SOCK_STREAM, 0);
if (fd < 0) { if (fd < 0)
fprintf (stderr, "%s: socket: %s\n", prog, strerror(errno)); err (1, "socket AF_UNIX");
return fd;
}
addr.sun_family = AF_UNIX; addr.sun_family = AF_UNIX;
sprintf (addr.sun_path, "/tmp/.X11-unix/X%u", dnr); sprintf (addr.sun_path, "/tmp/.X11-unix/X%u", dnr);
if (connect (fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { if (connect (fd, (struct sockaddr *)&addr, sizeof(addr)) < 0)
fprintf (stderr, "%s: connect: %s\n", prog, err (1, "connect");
strerror(errno));
return -1;
}
return fd; return fd;
} }

65
appl/kx/kx.c
View File

@@ -40,8 +40,6 @@
RCSID("$Id$"); RCSID("$Id$");
char *prog;
static int nchild; static int nchild;
static int donep; static int donep;
@@ -117,7 +115,7 @@ connect_host (char *host, char *user, des_cblock *key,
hostent = gethostbyname (host); hostent = gethostbyname (host);
if (hostent == NULL) { if (hostent == NULL) {
warnx ("%s: gethostbyname '%s' failed: %s", prog, host, warnx ("gethostbyname '%s' failed: %s", host,
#ifdef HAVE_H_ERRNO #ifdef HAVE_H_ERRNO
hstrerror(h_errno) hstrerror(h_errno)
#else #else
@@ -135,10 +133,10 @@ connect_host (char *host, char *user, des_cblock *key,
s = socket (AF_INET, SOCK_STREAM, 0); s = socket (AF_INET, SOCK_STREAM, 0);
if (s < 0) if (s < 0)
err (1, "%s: socket failed", prog); err (1, "socket");
if (connect (s, (struct sockaddr *)thataddr, sizeof(*thataddr)) < 0) { if (connect (s, (struct sockaddr *)thataddr, sizeof(*thataddr)) < 0) {
warn ("%s: connect(%s) failed", prog, host); warn ("connect(%s)", host);
close (s); close (s);
continue; continue;
} else { } else {
@@ -151,14 +149,13 @@ connect_host (char *host, char *user, des_cblock *key,
addrlen = sizeof(*thisaddr); addrlen = sizeof(*thisaddr);
if (getsockname (s, (struct sockaddr *)thisaddr, &addrlen) < 0 || if (getsockname (s, (struct sockaddr *)thisaddr, &addrlen) < 0 ||
addrlen != sizeof(*thisaddr)) addrlen != sizeof(*thisaddr))
err(1, "%s: getsockname(%s) failed", err(1, "getsockname(%s)", host);
prog, host);
status = krb_sendauth (KOPT_DO_MUTUAL, s, &text, "rcmd", status = krb_sendauth (KOPT_DO_MUTUAL, s, &text, "rcmd",
host, krb_realmofhost (host), host, krb_realmofhost (host),
getpid(), &msg, &cred, schedule, getpid(), &msg, &cred, schedule,
thisaddr, thataddr, KX_VERSION); thisaddr, thataddr, KX_VERSION);
if (status != KSUCCESS) { if (status != KSUCCESS) {
warnx ("%s: %s: %s\n", prog, host, krb_get_err_text(status)); warnx ("%s: %s\n", host, krb_get_err_text(status));
return -1; return -1;
} }
memcpy(key, cred.session, sizeof(des_cblock)); memcpy(key, cred.session, sizeof(des_cblock));
@@ -200,7 +197,7 @@ status_output (int debugp)
pid = fork(); pid = fork();
if (pid < 0) { if (pid < 0) {
err(1, "%s: fork", prog); err(1, "fork");
} else if (pid > 0) { } else if (pid > 0) {
printf ("%u\t%s\t%s\n", (unsigned)pid, display, xauthfile); printf ("%u\t%s\t%s\n", (unsigned)pid, display, xauthfile);
exit (0); exit (0);
@@ -252,18 +249,18 @@ doit_passive (char *host, char *user, int debugp, int keepalivep,
*p++ = PASSIVE | (keepalivep ? KEEP_ALIVE : 0); *p++ = PASSIVE | (keepalivep ? KEEP_ALIVE : 0);
if (write_encrypted (otherside, msg, p - msg, schedule, if (write_encrypted (otherside, msg, p - msg, schedule,
&key, &me, &him) < 0) &key, &me, &him) < 0)
err (1, "%s: write to %s failed", prog, host); err (1, "write to %s", host);
len = read_encrypted (otherside, msg, sizeof(msg), &ret, len = read_encrypted (otherside, msg, sizeof(msg), &ret,
schedule, &key, &him, &me); schedule, &key, &him, &me);
if (len < 0) if (len < 0)
err (1, "%s: read from %s failed", prog, host); err (1, "read from %s", host);
p = (u_char *)ret; p = (u_char *)ret;
if (*p == ERROR) { if (*p == ERROR) {
p++; p++;
p += krb_get_int (p, &tmp, 4, 0); p += krb_get_int (p, &tmp, 4, 0);
errx (1, "%s: %s: %.*s", prog, host, tmp, p); errx (1, "%s: %.*s", host, tmp, p);
} else if (*p != ACK) { } else if (*p != ACK) {
errx (1, "%s: %s: strange msg %d", prog, host, *p); errx (1, "%s: strange msg %d", host, *p);
} else } else
p++; p++;
p += krb_get_int (p, &tmp, 4, 0); p += krb_get_int (p, &tmp, 4, 0);
@@ -284,7 +281,7 @@ doit_passive (char *host, char *user, int debugp, int keepalivep,
len = read_encrypted (otherside, msg, sizeof(msg), &ret, len = read_encrypted (otherside, msg, sizeof(msg), &ret,
schedule, &key, &him, &me); schedule, &key, &him, &me);
if (len < 0) if (len < 0)
err (1, "%s: read from %s failed", prog, host); err (1, "read from %s", host);
else if (len == 0) else if (len == 0)
return 0; return 0;
@@ -292,9 +289,9 @@ doit_passive (char *host, char *user, int debugp, int keepalivep,
if (*p == ERROR) { if (*p == ERROR) {
p++; p++;
p += krb_get_int (p, &tmp, 4, 0); p += krb_get_int (p, &tmp, 4, 0);
errx (1, "%s: %s: %.*s", prog, host, tmp, p); errx (1, "%s: %.*s", host, tmp, p);
} else if(*p != NEW_CONN) { } else if(*p != NEW_CONN) {
errx (1, "%s: %s: strange msg %d", prog, host, *p); errx (1, "%s: strange msg %d", host, *p);
} else { } else {
p++; p++;
p += krb_get_int (p, &tmp, 4, 0); p += krb_get_int (p, &tmp, 4, 0);
@@ -303,7 +300,7 @@ doit_passive (char *host, char *user, int debugp, int keepalivep,
++nchild; ++nchild;
child = fork (); child = fork ();
if (child < 0) { if (child < 0) {
warn("%s: fork", prog); warn("fork");
continue; continue;
} else if (child == 0) { } else if (child == 0) {
struct sockaddr_in addr; struct sockaddr_in addr;
@@ -317,7 +314,7 @@ doit_passive (char *host, char *user, int debugp, int keepalivep,
addr.sin_port = htons(tmp); addr.sin_port = htons(tmp);
fd = socket (AF_INET, SOCK_STREAM, 0); fd = socket (AF_INET, SOCK_STREAM, 0);
if (fd < 0) if (fd < 0)
err(1, "%s: socket", prog); err(1, "socket");
#if defined(TCP_NODELAY) && defined(HAVE_SETSOCKOPT) #if defined(TCP_NODELAY) && defined(HAVE_SETSOCKOPT)
{ {
int one = 1; int one = 1;
@@ -336,7 +333,7 @@ doit_passive (char *host, char *user, int debugp, int keepalivep,
#endif #endif
if (connect (fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) if (connect (fd, (struct sockaddr *)&addr, sizeof(addr)) < 0)
err(1, "%s: connect", prog); err(1, "connect(%s)", host);
xserver = connect_local_xsocket (0); xserver = connect_local_xsocket (0);
if (xserver < 0) if (xserver < 0)
return 1; return 1;
@@ -403,19 +400,19 @@ doit_active (char *host, char *user,
if (write_encrypted (otherside, msg, p - msg, schedule, if (write_encrypted (otherside, msg, p - msg, schedule,
&key, &me, &him) < 0) &key, &me, &him) < 0)
err (1, "%s: write to %s failed", prog, host); err (1, "write to %s", host);
len = read_encrypted (otherside, msg, sizeof(msg), &ret, len = read_encrypted (otherside, msg, sizeof(msg), &ret,
schedule, &key, &him, &me); schedule, &key, &him, &me);
if (len < 0) if (len < 0)
err (1, "%s: read from %s failed", prog, host); err (1, "read from %s", host);
p = (u_char *)ret; p = (u_char *)ret;
if (*p == ERROR) { if (*p == ERROR) {
p++; p++;
p += krb_get_int (p, &tmp, 4, 0); p += krb_get_int (p, &tmp, 4, 0);
errx (1, "%s: %s: %.*s", prog, host, tmp, p); errx (1, "%s: %.*s", host, tmp, p);
} else if (*p != ACK) { } else if (*p != ACK) {
errx (1, "%s: %s: strange msg %d", prog, host, *p); errx (1, "%s: strange msg %d", host, *p);
} else } else
p++; p++;
@@ -457,24 +454,24 @@ doit_active (char *host, char *user,
if (errno == EINTR) if (errno == EINTR)
continue; continue;
else else
err(1, "%s: accept", prog); err(1, "accept");
p = msg; p = msg;
*p++ = NEW_CONN; *p++ = NEW_CONN;
if (write_encrypted (otherside, msg, p - msg, schedule, if (write_encrypted (otherside, msg, p - msg, schedule,
&key, &me, &him) < 0) &key, &me, &him) < 0)
err (1, "%s: write to %s failed", prog, host); err (1, "write to %s", host);
len = read_encrypted (otherside, msg, sizeof(msg), &ret, len = read_encrypted (otherside, msg, sizeof(msg), &ret,
schedule, &key, &him, &me); schedule, &key, &him, &me);
if (len < 0) if (len < 0)
err (1, "%s: read from %s failed", prog, host); err (1, "read from %s", host);
p = (u_char *)ret; p = (u_char *)ret;
if (*p == ERROR) { if (*p == ERROR) {
p++; p++;
p += krb_get_int (p, &tmp, 4, 0); p += krb_get_int (p, &tmp, 4, 0);
errx (1, "%s: %s: %.*s", prog, host, tmp, p); errx (1, "%s: %.*s", host, tmp, p);
} else if (*p != NEW_CONN) { } else if (*p != NEW_CONN) {
errx (1, "%s: %s: strange msg %d", prog, host, *p); errx (1, "%s: strange msg %d", host, *p);
} else { } else {
p++; p++;
p += krb_get_int (p, &tmp, 4, 0); p += krb_get_int (p, &tmp, 4, 0);
@@ -483,7 +480,7 @@ doit_active (char *host, char *user,
++nchild; ++nchild;
child = fork (); child = fork ();
if (child < 0) { if (child < 0) {
warn("%s: fork", prog); warn("fork");
continue; continue;
} else if (child == 0) { } else if (child == 0) {
int s; int s;
@@ -502,7 +499,7 @@ doit_active (char *host, char *user,
addr.sin_port = htons(tmp); addr.sin_port = htons(tmp);
s = socket (AF_INET, SOCK_STREAM, 0); s = socket (AF_INET, SOCK_STREAM, 0);
if (s < 0) if (s < 0)
err(1, "%s: socket", prog); err(1, "socket");
#if defined(TCP_NODELAY) && defined(HAVE_SETSOCKOPT) #if defined(TCP_NODELAY) && defined(HAVE_SETSOCKOPT)
{ {
int one = 1; int one = 1;
@@ -521,7 +518,7 @@ doit_active (char *host, char *user,
#endif #endif
if (connect (s, (struct sockaddr *)&addr, sizeof(addr)) < 0) if (connect (s, (struct sockaddr *)&addr, sizeof(addr)) < 0)
err(1, "%s: connect", prog); err(1, "connect");
return active_session (fd, s, &key, schedule); return active_session (fd, s, &key, schedule);
} else { } else {
@@ -534,7 +531,7 @@ static void
usage(void) usage(void)
{ {
fprintf (stderr, "Usage: %s [-p port] [-d] [-t] [-l remoteuser] host\n", fprintf (stderr, "Usage: %s [-p port] [-d] [-t] [-l remoteuser] host\n",
prog); __progname);
exit (1); exit (1);
} }
@@ -553,7 +550,7 @@ main(int argc, char **argv)
int c; int c;
int port = 0; int port = 0;
prog = argv[0]; set_progname (argv[0]);
while((c = getopt(argc, argv, "ktdl:p:")) != EOF) { while((c = getopt(argc, argv, "ktdl:p:")) != EOF) {
switch(c) { switch(c) {
case 'd' : case 'd' :
@@ -585,7 +582,7 @@ main(int argc, char **argv)
if (user == NULL) { if (user == NULL) {
struct passwd *p = k_getpwuid (getuid ()); struct passwd *p = k_getpwuid (getuid ());
if (p == NULL) if (p == NULL)
errx(1, "%s: Who are you?\n", prog); errx(1, "Who are you?");
user = strdup (p->pw_name); user = strdup (p->pw_name);
} }
if (port == 0) if (port == 0)

12
appl/kx/kxd.c
View File

@@ -40,8 +40,6 @@
RCSID("$Id$"); RCSID("$Id$");
char *prog;
/* /*
* Signal handler that justs waits for the children when they die. * Signal handler that justs waits for the children when they die.
*/ */
@@ -132,8 +130,8 @@ recv_conn (int sock, des_cblock *key, des_key_schedule schedule,
thataddr, thisaddr, &auth, "", schedule, thataddr, thisaddr, &auth, "", schedule,
version); version);
if (status != KSUCCESS) if (status != KSUCCESS)
errx(1, "%s: krb_recvauth: %s", syslog (LOG_ERR, "krb_recvauth: %s",
prog, krb_get_err_text(status)); krb_get_err_text(status));
if( strncmp(version, KX_VERSION, KRB_SENDAUTH_VLEN) != 0) if( strncmp(version, KX_VERSION, KRB_SENDAUTH_VLEN) != 0)
fatal(sock, key, schedule, thisaddr, thataddr, fatal(sock, key, schedule, thisaddr, thataddr,
"Bad version %s", version); "Bad version %s", version);
@@ -464,7 +462,7 @@ doit(int sock, int tcpp)
static void static void
usage (void) usage (void)
{ {
fprintf (stderr, "Usage: %s [-i] [-t] [-p port]\n", prog); fprintf (stderr, "Usage: %s [-i] [-t] [-p port]\n", __progname);
exit (1); exit (1);
} }
@@ -480,7 +478,7 @@ main (int argc, char **argv)
int tcpp = 0; int tcpp = 0;
int port = 0; int port = 0;
prog = argv[0]; set_progname (argv[0]);
while( (c = getopt (argc, argv, "itp:")) != EOF) { while( (c = getopt (argc, argv, "itp:")) != EOF) {
switch (c) { switch (c) {
@@ -502,7 +500,7 @@ main (int argc, char **argv)
if (no_inetd) if (no_inetd)
mini_inetd (port ? port : k_getportbyname("kx", "tcp", mini_inetd (port ? port : k_getportbyname("kx", "tcp",
htons(KX_PORT))); htons(KX_PORT)));
openlog(prog, LOG_PID|LOG_CONS, LOG_DAEMON); openlog(__progname, LOG_PID|LOG_CONS, LOG_DAEMON);
signal (SIGCHLD, childhandler); signal (SIGCHLD, childhandler);
return doit(STDIN_FILENO, tcpp); return doit(STDIN_FILENO, tcpp);
} }