X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/2b33ac4021396c810eef5c3f5a85615154e54e05..c09e47ff3bbc471218a1307d7f7bc741eaf14da1:/usr/src/usr.bin/passwd/krb_passwd.c

diff --git a/usr/src/usr.bin/passwd/krb_passwd.c b/usr/src/usr.bin/passwd/krb_passwd.c
index 5aab32da1e..d76715b441 100644
--- a/usr/src/usr.bin/passwd/krb_passwd.c
+++ b/usr/src/usr.bin/passwd/krb_passwd.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)krb_passwd.c	8.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)krb_passwd.c	8.2 (Berkeley) %G%";
 #endif /* not lint */
 
 #ifdef KERBEROS
@@ -18,27 +18,39 @@ static char sccsid[] = "@(#)krb_passwd.c	8.1 (Berkeley) %G%";
 #include <netinet/in.h>
 #include <kerberosIV/des.h>
 #include <kerberosIV/krb.h>
+
+#include <err.h>
+#include <errno.h>
 #include <netdb.h>
-#include <signal.h>
 #include <pwd.h>
-#include <errno.h>
+#include <signal.h>
 #include <stdio.h>
-#include "kpasswd_proto.h"
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "kpasswd_proto.h"
+
+#include "extern.h"
 
 #define	PROTO	"tcp"
 
+static void	send_update __P((int, char *, char *));
+static void	recv_ack __P((int));
+static void	cleanup __P((void));
+static void	finish __P((void));
+
 static struct timeval timeout = { CLIENT_KRB_TIMEOUT, 0 };
 static struct kpasswd_data proto_data;
 static des_cblock okey;
 static Key_schedule osched;
-KTEXT_ST ticket;
-Key_schedule random_schedule;
-long authopts;
-char realm[REALM_SZ], krbhst[MAX_HSTNM];
-int sock;
+static KTEXT_ST ticket;
+static Key_schedule random_schedule;
+static long authopts;
+static char realm[REALM_SZ], krbhst[MAX_HSTNM];
+static int sock;
 
+int
 krb_passwd()
 {
 	struct servent *se;
@@ -57,52 +69,47 @@ krb_passwd()
 	(void)signal(SIGTSTP, SIG_IGN);
 
 	if (setrlimit(RLIMIT_CORE, &rl) < 0) {
-		(void)fprintf(stderr,
-		    "passwd: setrlimit: %s\n", strerror(errno));
-		return(1);
+		warn("setrlimit");
+		return (1);
 	}
 
 	if ((se = getservbyname(SERVICE, PROTO)) == NULL) {
-		(void)fprintf(stderr,
-		    "passwd: couldn't find entry for service %s/%s\n",
+		warnx("couldn't find entry for service %s/%s",
 		    SERVICE, PROTO);
-		return(1);
+		return (1);
 	}
 
 	if ((rval = krb_get_lrealm(realm,1)) != KSUCCESS) {
-		(void)fprintf(stderr,
-		    "passwd: couldn't get local Kerberos realm: %s\n",
+		warnx("couldn't get local Kerberos realm: %s",
 		    krb_err_txt[rval]);
-		return(1);
+		return (1);
 	}
 
 	if ((rval = krb_get_krbhst(krbhst, realm, 1)) != KSUCCESS) {
-		(void)fprintf(stderr,
-		    "passwd: couldn't get Kerberos host: %s\n",
+		warnx("couldn't get Kerberos host: %s",
 		    krb_err_txt[rval]);
-		return(1);
+		return (1);
 	}
 
 	if ((host = gethostbyname(krbhst)) == NULL) {
-		(void)fprintf(stderr,
-		    "passwd: couldn't get host entry for krb host %s\n",
+		warnx("couldn't get host entry for krb host %s",
 		    krbhst);
-		return(1);
+		return (1);
 	}
 
 	sin.sin_family = host->h_addrtype;
-	bcopy(host->h_addr, (char *) &sin.sin_addr, host->h_length);
+	memmove((char *) &sin.sin_addr, host->h_addr, host->h_length);
 	sin.sin_port = se->s_port;
 
 	if ((sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) {
-		(void)fprintf(stderr, "passwd: socket: %s\n", strerror(errno));
-		return(1);
+		warn("socket");
+		return (1);
 	}
 
 	if (connect(sock, (struct sockaddr *) &sin, sizeof(sin)) < 0) {
-		(void)fprintf(stderr, "passwd: connect: %s\n", strerror(errno));
+		warn("connect");
 		(void)close(sock);
-		return(1);
+		return (1);
 	}
 
 	rval = krb_sendauth(
@@ -122,9 +129,8 @@ krb_passwd()
 	);
 
 	if (rval != KSUCCESS) {
-		(void)fprintf(stderr, "passwd: Kerberos sendauth error: %s\n",
-		    krb_err_txt[rval]);
-		return(1);
+		warnx("Kerberos sendauth error: %s", krb_err_txt[rval]);
+		return (1);
 	}
 
 	krb_get_cred("krbtgt", realm, realm, &cred);
@@ -134,9 +140,8 @@ krb_passwd()
 
 	if (des_read_pw_string(pass,
 	    sizeof(pass)-1, "Old Kerberos password:", 0)) {
-		(void)fprintf(stderr,
-		    "passwd: error reading old Kerberos password\n");
-		return(1);
+		warnx("error reading old Kerberos password");
+		return (1);
 	}
 
 	(void)des_string_to_key(pass, okey);
@@ -153,23 +158,22 @@ krb_passwd()
 
 	if ((rval < 1) || !FD_ISSET(sock, &readfds)) {
 		if(rval == 0) {
-			(void)fprintf(stderr, "passwd: timed out (aborted)\n");
+			warnx("timed out (aborted)");
 			cleanup();
-			return(1);
+			return (1);
 		}
-		(void)fprintf(stderr, "passwd: select failed (aborted)\n");
+		warnx("select failed (aborted)");
 		cleanup();
-		return(1);
+		return (1);
 	}
 
 	/* read verification string */
 
 	if (des_read(sock, &proto_data, sizeof(proto_data)) !=
 	    sizeof(proto_data)) {
-		(void)fprintf(stderr,
-		    "passwd: couldn't read verification string (aborted)\n");
+		warnx("couldn't read verification string (aborted)");
 		cleanup();
-		return(1);
+		return (1);
 	}
 
 	(void)signal(SIGHUP, finish);
@@ -179,36 +183,33 @@ krb_passwd()
 		cleanup();
 		/* don't complain loud if user just hit return */
 		if (pass == NULL || (!*pass))
-			return(0);
+			return (0);
 		(void)fprintf(stderr, "Sorry\n");
-		return(1);
+		return (1);
 	}
 
 	(void)des_key_sched(proto_data.random_key, random_schedule);
 	(void)des_set_key(proto_data.random_key, random_schedule);
-	(void)bzero(pass, sizeof(pass));
+	(void)memset(pass, 0, sizeof(pass));
 
 	if (des_read_pw_string(pass,
 	    sizeof(pass)-1, "New Kerberos password:", 0)) {
-		(void)fprintf(stderr,
-		    "passwd: error reading new Kerberos password (aborted)\n");
+		warnx("error reading new Kerberos password (aborted)");
 		cleanup();
-		return(1);
+		return (1);
 	}
 
 	if (des_read_pw_string(password,
 	    sizeof(password)-1, "Retype new Kerberos password:", 0)) {
-		(void)fprintf(stderr,
-		    "passwd: error reading new Kerberos password (aborted)\n");
+		warnx("error reading new Kerberos password (aborted)");
 		cleanup();
-		return(1);
+		return (1);
 	}
 
 	if (strcmp(password, pass) != 0) {
-		(void)fprintf(stderr,
-		    "passwd: password mismatch (aborted)\n");
+		warnx("password mismatch (aborted)");
 		cleanup();
-		return(1);
+		return (1);
 	}
 
 	if (strlen(pass) == 0)
@@ -225,20 +226,20 @@ krb_passwd()
 	    select(sock + 1, &readfds, (fd_set *) 0, (fd_set *) 0, &timeout);
 	if ((rval < 1) || !FD_ISSET(sock, &readfds)) {
 		if(rval == 0) {
-			(void)fprintf(stderr,
-			    "passwd: timed out reading ACK (aborted)\n");
+			warnx("timed out reading ACK (aborted)");
 			cleanup();
 			exit(1);
 		}
-		(void)fprintf(stderr, "passwd: select failed (aborted)\n");
+		warnx("select failed (aborted)");
 		cleanup();
 		exit(1);
 	}
 	recv_ack(sock);
 	cleanup();
-	exit(0);
+	return (0);
 }
 
+static void
 send_update(dest, pwd, str)
 	int dest;
 	char *pwd, *str;
@@ -248,14 +249,14 @@ send_update(dest, pwd, str)
 	(void)strncpy(ud.secure_msg, str, _PASSWORD_LEN);
 	(void)strncpy(ud.pw, pwd, sizeof(ud.pw));
 	if (des_write(dest, &ud, sizeof(ud)) != sizeof(ud)) {
-		(void)fprintf(stderr,
-		    "passwd: couldn't write pw update (abort)\n");
-		bzero((char *)&ud, sizeof(ud));
+		warnx("couldn't write pw update (abort)");
+		memset((char *)&ud, 0, sizeof(ud));
 		cleanup();
 		exit(1);
 	}
 }
 
+static void
 recv_ack(remote)
 	int remote;
 {
@@ -264,25 +265,27 @@ recv_ack(remote)
 
 	cc = des_read(remote, buf, sizeof(buf));
 	if (cc <= 0) {
-		(void)fprintf(stderr,
-		    "passwd: error reading acknowledgement (aborted)\n");
+		warnx("error reading acknowledgement (aborted)");
 		cleanup();
 		exit(1);
 	}
 	(void)printf("%s", buf);
 }
 
+static void
 cleanup()
 {
-	(void)bzero((char *)&proto_data, sizeof(proto_data));
-	(void)bzero((char *)okey, sizeof(okey));
-	(void)bzero((char *)osched, sizeof(osched));
-	(void)bzero((char *)random_schedule, sizeof(random_schedule));
+
+	(void)memset((char *)&proto_data, 0, sizeof(proto_data));
+	(void)memset((char *)okey, 0, sizeof(okey));
+	(void)memset((char *)osched, 0, sizeof(osched));
+	(void)memset((char *)random_schedule, 0, sizeof(random_schedule));
 }
 
 static void
 finish()
 {
+
 	(void)close(sock);
 	exit(1);
 }