diff options
author | Steve Price <steve@FreeBSD.org> | 1999-05-09 17:50:07 +0000 |
---|---|---|
committer | Steve Price <steve@FreeBSD.org> | 1999-05-09 17:50:07 +0000 |
commit | 754ea881597bf8ee78f2777812190c09b28c6fdc (patch) | |
tree | 5ad716d93c2f653b8c1b5841f4fe7c1cbb340d86 /security/slush/files | |
parent | fix more stupid typos (diff) |
Initial import of slush version 0.1.0.
A telnet-like application which uses a secure SSL channel.
PR: 11557
Submitted by: Peter Shipley <shipley@dis.org>
Diffstat (limited to 'security/slush/files')
-rw-r--r-- | security/slush/files/patch-aa | 60 | ||||
-rw-r--r-- | security/slush/files/patch-ab | 19 | ||||
-rw-r--r-- | security/slush/files/patch-ac | 120 |
3 files changed, 199 insertions, 0 deletions
diff --git a/security/slush/files/patch-aa b/security/slush/files/patch-aa new file mode 100644 index 000000000000..b7a70d5f7847 --- /dev/null +++ b/security/slush/files/patch-aa @@ -0,0 +1,60 @@ +*** Makefile.in.orig Tue Apr 6 03:05:04 1999 +--- Makefile.in Sun May 9 00:05:44 1999 +*************** +*** 9,27 **** + + CC=@CC@ + INSTALL=@INSTALL@ +! CFLAGS=@CFLAGS@ -Wall -DVERSION=\"$(VERSION)\" -I/usr/local/ssl/include -I/usr/include/ssl +! LIBS=@LIBS@ -L/usr/local/ssl/lib -lssl -lcrypto + + all: slush slushd + + slushd: slushd.o common.o +! $(CC) $(LDFLAGS) -s -o $@ slushd.o common.o $(LIBS) + + slushd.o: slushd.c common.o + $(CC) -c $(CFLAGS) slushd.c + + slush: slush.o common.o +! $(CC) $(LDFLAGS) -s -o $@ slush.o common.o $(LIBS) + + slush.o: slush.c common.o + $(CC) -c $(CFLAGS) slush.c +--- 9,27 ---- + + CC=@CC@ + INSTALL=@INSTALL@ +! CFLAGS=@CFLAGS@ -Wall -DVERSION=\"$(VERSION)\" -I/usr/local/include +! LIBS=@LIBS@ -L/usr/local/lib -lssl -lcrypto $(EXTRA_SSL_LIBS) -lutil + + all: slush slushd + + slushd: slushd.o common.o +! $(CC) -static $(LDFLAGS) -o $@ slushd.o common.o $(LIBS) + + slushd.o: slushd.c common.o + $(CC) -c $(CFLAGS) slushd.c + + slush: slush.o common.o +! $(CC) -static $(LDFLAGS) -o $@ slush.o common.o $(LIBS) + + slush.o: slush.c common.o + $(CC) -c $(CFLAGS) slush.c +*************** +*** 38,44 **** + install: $(SBINDIR)/slushd $(MANDIR)/slush.8 + + cert: +! ssleay req -new -x509 -nodes \ + -out slushd.pem -days 365 -keyout slushd.pem + + clean: +--- 38,44 ---- + install: $(SBINDIR)/slushd $(MANDIR)/slush.8 + + cert: +! openssl req -new -x509 -nodes \ + -out slushd.pem -days 365 -keyout slushd.pem + + clean: diff --git a/security/slush/files/patch-ab b/security/slush/files/patch-ab new file mode 100644 index 000000000000..2a72fc630570 --- /dev/null +++ b/security/slush/files/patch-ab @@ -0,0 +1,19 @@ +*** slush.c- Fri May 7 03:31:04 1999 +--- slush.c Fri May 7 03:31:14 1999 +*************** +*** 34,40 **** + #include <signal.h> + #include <string.h> + #include <stdlib.h> +! #include <getopt.h> + #include <termios.h> + #include <pwd.h> + #include <sys/ioctl.h> +--- 34,40 ---- + #include <signal.h> + #include <string.h> + #include <stdlib.h> +! /* #include <getopt.h> */ + #include <termios.h> + #include <pwd.h> + #include <sys/ioctl.h> diff --git a/security/slush/files/patch-ac b/security/slush/files/patch-ac new file mode 100644 index 000000000000..8ee3c7fe9268 --- /dev/null +++ b/security/slush/files/patch-ac @@ -0,0 +1,120 @@ +*** slushd.c.orig Tue Apr 6 05:14:04 1999 +--- slushd.c Sat May 8 23:53:40 1999 +*************** +*** 40,46 **** + #include <ctype.h> + #include <stdlib.h> + #include <netdb.h> +! #include <getopt.h> + #include <pwd.h> + #include <grp.h> + #include <fcntl.h> +--- 40,46 ---- + #include <ctype.h> + #include <stdlib.h> + #include <netdb.h> +! #include <libutil.h> + #include <pwd.h> + #include <grp.h> + #include <fcntl.h> +*************** +*** 51,56 **** +--- 51,57 ---- + #include <sys/stat.h> + #include <sys/ioctl.h> + #include <sys/file.h> ++ + #ifdef HAVE_UNISTD_H + #include <unistd.h> /* fork, execvp, exit */ + #endif +*************** +*** 654,711 **** + void log_uwtmp(struct passwd *pw, struct in_addr *i, char *tty, int is_logout) + { + struct utmp ut; +- int wtmp; +- int lock; + + tty = strrchr(tty, '/'); + if (tty == NULL) + { + syslog(LOG_ERR, "Can't determine basename of tty"); +! exit(3); + } + tty++; + +- utmpname(_PATH_UTMP); +- setutent(); +- memset(&ut, 0, sizeof(ut)); + +! if (ut.ut_id[0] == 0) +! strncpy(ut.ut_id, tty + 3, sizeof(ut.ut_id)); + +- if (!is_logout) +- strncpy(ut.ut_user, pw->pw_name, sizeof(ut.ut_user)); +- + strncpy(ut.ut_line, tty, sizeof(ut.ut_line) - 1); +! ut.ut_line[sizeof(ut.ut_line) - 1] = 0; +! +! ut.ut_time = time(NULL); +! ut.ut_type = is_logout?DEAD_PROCESS:USER_PROCESS; +! ut.ut_pid = getpid(); + +- strncpy(ut.ut_host, hostname, sizeof(ut.ut_host) - 1); +- ut.ut_host[sizeof(ut.ut_host) - 1] = 0; + +! memcpy(&ut.ut_addr, i, sizeof(ut.ut_addr)); +! +! pututline(&ut); +! endutent(); +! +! lock = open(_PATH_WTMPLOCK, O_CREAT|O_WRONLY, 0660); +! if (lock == -1) +! ioerror("open"); +! +! if (flock(lock, LOCK_EX) == -1) +! ioerror("flock"); +! +! wtmp = open(_PATH_WTMP, O_APPEND|O_WRONLY); +! if (wtmp == -1) +! ioerror("open"); +! +! write(wtmp, (char *)&ut, sizeof(ut)); +! close(wtmp); +! +! flock(lock, LOCK_UN); +! close(lock); + } + + /* Retrieve client X509 certificate and test authentication */ +--- 655,684 ---- + void log_uwtmp(struct passwd *pw, struct in_addr *i, char *tty, int is_logout) + { + struct utmp ut; + + tty = strrchr(tty, '/'); + if (tty == NULL) + { + syslog(LOG_ERR, "Can't determine basename of tty"); +! return; + } + tty++; ++ + + +! if(is_logout) { +! logout(tty); +! return; +! } + + strncpy(ut.ut_line, tty, sizeof(ut.ut_line) - 1); +! strncpy(ut.ut_name, pw->pw_name, sizeof(ut.ut_name)-1); +! strncpy(ut.ut_host, inet_ntoa(*i), sizeof(ut.ut_host) - 1); +! ut.ut_time = time(0); +! login(&ut); + + +! return; + } + + /* Retrieve client X509 certificate and test authentication */ |