inetutils/rlogind rlogind.c

[shishi-commit]

CVSROOT:        /cvsroot/shishi
Module name:    inetutils
Branch:         
Changes by:     Nicolas Pouvesle <address@hidden>       03/09/17 09:18:36

Modified files:
        rlogind        : rlogind.c 

Log message:
        Add KCMDV0.1 protocol support.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/inetutils/rlogind/rlogind.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: inetutils/rlogind/rlogind.c
diff -u inetutils/rlogind/rlogind.c:1.2 inetutils/rlogind/rlogind.c:1.3
--- inetutils/rlogind/rlogind.c:1.2     Sat Sep 13 16:13:42 2003
+++ inetutils/rlogind/rlogind.c Wed Sep 17 09:18:36 2003
@@ -249,12 +249,12 @@
 # define IF_NOT_ENCRYPT(stmt) if (!encrypt_io) stmt
 # define ENC_READ(c, fd, buf, size, ap) \
  if (encrypt_io) \
-     readenc (ap->h, fd, buf, &c, &ap->iv1, ap->enckey); \
+     readenc (ap->h, fd, buf, &c, &ap->iv1, ap->enckey, ap->protocol); \
  else \
      c = read(fd, buf, size);
 # define ENC_WRITE(c, fd, buf, size, ap) \
  if (encrypt_io) \
-     writeenc (ap->h, fd, buf, size, &c, &ap->iv2, ap->enckey); \
+     writeenc (ap->h, fd, buf, size, &c, &ap->iv2, ap->enckey, ap->protocol); \
  else \
      c = write(fd, buf, size);
 #else
@@ -593,8 +593,8 @@
       confirmed = 1;           /* we sent the null! */
     }
 #ifdef SHISHI
-  len = sizeof (SECURE_MESSAGE) -1;
-  IF_ENCRYPT (writeenc (ap->h, fd, SECURE_MESSAGE, len, &c, &ap->iv2, 
ap->enckey));
+  len = sizeof (SECURE_MESSAGE) - 1;
+  IF_ENCRYPT (writeenc (ap->h, fd, SECURE_MESSAGE, len, &c, &ap->iv2, 
ap->enckey, ap->protocol));
 #else
   IF_ENCRYPT (des_write (fd, SECURE_MESSAGE, sizeof (SECURE_MESSAGE) - 1));
 #endif
@@ -1009,14 +1009,13 @@
   struct passwd *pwd = NULL;
 
 #ifdef ENCRYPTION  
-  rc = get_auth (infd, &ad->h, &ad->enckey, err_msg);
+  rc = get_auth (infd, &ad->h, &ad->enckey, err_msg, &ad->protocol);
 #else
-  rc = get_auth (infd, &ad->h, NULL, err_msg);
+  rc = get_auth (infd, &ad->h, NULL, err_msg, &ad->protocol);
 #endif
   if (rc != SHISHI_OK)
     return rc;
 
-
 #ifdef ENCRYPTION
   /* init IV */
   if (encrypt_io)
@@ -1173,7 +1172,7 @@
    */
   signal (SIGTTOU, SIG_IGN);
 #ifdef SHISHI
-  if (kerberos)
+  if (kerberos && (ap->protocol == 2))
     {
       ENC_WRITE (n, f, oobdata_new, 5, ap);
     }
@@ -1258,7 +1257,7 @@
            {
              register char *cp;
              int left;
-
+             
              if (fcc <= 0)
                break;
              fbp = fibuf;