1) Added s/key support .

[unix-history] / libexec / rexecd / rexecd.c

diff --git a/libexec/rexecd/rexecd.c b/libexec/rexecd/rexecd.c
index a88f92b..ff2704b 100644 (file)
--- a/libexec/rexecd/rexecd.c
+++ b/libexec/rexecd/rexecd.c
@@ -98,7 +98,13 @@ doit(f, fromp)
        struct sockaddr_in *fromp;
 {
        char cmdbuf[NCARGS+1], *cp, *namep;
        struct sockaddr_in *fromp;
 {
        char cmdbuf[NCARGS+1], *cp, *namep;

+#ifdef SKEY
+       char *skey_crypt();
+       int permit_passwd = authfile(inet_ntoa(fromp->sin_addr));
+       char user[16], pass[100];
+#else /* SKEY */

        char user[16], pass[16];
        char user[16], pass[16];

+#endif /* SKEY */

        struct passwd *pwd;
        int s;
        u_short port;
        struct passwd *pwd;
        int s;
        u_short port;


@@ -154,7 +160,11 @@ doit(f, fromp)
        }
        endpwent();
        if (*pwd->pw_passwd != '\0') {
        }
        endpwent();
        if (*pwd->pw_passwd != '\0') {

+#ifdef SKEY
+               namep = skey_crypt(pass, pwd->pw_passwd, pwd, permit_passwd);
+#else /* SKEY */

                namep = crypt(pass, pwd->pw_passwd);
                namep = crypt(pass, pwd->pw_passwd);

+#endif /* SKEY */

                if (strcmp(namep, pwd->pw_passwd)) {
                        error("Password incorrect.\n");
                        exit(1);
                if (strcmp(namep, pwd->pw_passwd)) {
                        error("Password incorrect.\n");
                        exit(1);