new kerberos libraries; always get children's status to avoid zombies

[moira.git] / clients / userreg / reg_stubs.c

diff --git a/clients/userreg/reg_stubs.c b/clients/userreg/reg_stubs.c
index 8ba0d8d8ce49c986ec2d4c6b967070ad0f5863f5..99daca2beaf62c7696a4d894975d28d97dff2568 100644 (file)
--- a/clients/userreg/reg_stubs.c
+++ b/clients/userreg/reg_stubs.c
@@ -3,23 +3,16 @@
  *     $Author$
  *     $Header$
  *
- *     Copyright (C) 1987 by the Massachusetts Institute of Technology
- *
- *     $Log$
- *     Revision 1.3  1988-08-03 20:16:10  mar
- *     increase timeout; don't copy login out of packet unless packet is long enough
- *
- * Revision 1.2  87/09/04  22:57:33  wesommer
- * Rearranged timeouts, max retransmits.
- * 
- * Revision 1.1  87/08/22  18:39:29  wesommer
- * Initial revision
- * 
+ *  (c) Copyright 1988 by the Massachusetts Institute of Technology.
+ *  For copying and distribution information, please see the file
+ *  <mit-copyright.h>.
  */
 
 #ifndef lint
 static char *rcsid_reg_stubs_c = "$Header$";
 #endif lint
+
+#include <mit-copyright.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/time.h>
@@ -43,8 +36,8 @@ ureg_init()
     struct hostent *hp;
     struct sockaddr_in sin;
     
-    init_ureg_err_tbl();
-    init_sms_err_tbl();
+    initialize_ureg_error_table();
+    initialize_sms_error_table();
     
     hp = gethostbyname("sms.mit.edu");
     if (hp == NULL) return UNKNOWN_HOST;
@@ -76,8 +69,8 @@ verify_user(first, last, idnumber, hashidnumber, login)
     char buf[1024];
     int version = ntohl((u_long)1);
     int call = ntohl((u_long)UREG_VERIFY_USER);
-    C_Block key;
-    Key_schedule ks;
+    des_cblock key;
+    des_key_schedule ks;
     register char *bp = buf;
     register int len;
     char crypt_src[1024];
@@ -104,9 +97,9 @@ verify_user(first, last, idnumber, hashidnumber, login)
 
     bcopy(hashidnumber, crypt_src+len, 13);
 
-    string_to_key(hashidnumber, key);
-    key_sched(key, ks);
-    pcbc_encrypt(crypt_src, bp, len+14, ks, key, 1);
+    des_string_to_key(hashidnumber, key);
+    des_key_sched(key, ks);
+    des_pcbc_encrypt(crypt_src, bp, len+14, ks, key, 1);
     bp += len+14+8;
     len = bp - buf;
     return do_call(buf, len, seq_no, login);
@@ -118,8 +111,8 @@ grab_login(first, last, idnumber, hashidnumber, login)
     char buf[1024];
     int version = ntohl((u_long)1);
     int call = ntohl((u_long)UREG_RESERVE_LOGIN);
-    C_Block key;
-    Key_schedule ks;
+    des_cblock key;
+    des_key_schedule ks;
     register char *bp = buf;
     register int len;
     
@@ -157,9 +150,9 @@ grab_login(first, last, idnumber, hashidnumber, login)
     cbp += len;
 
     len = cbp - crypt_src;
-    string_to_key(hashidnumber, key);
-    key_sched(key, ks);
-    pcbc_encrypt(crypt_src, bp, len, ks, key, 1);
+    des_string_to_key(hashidnumber, key);
+    des_key_sched(key, ks);
+    des_pcbc_encrypt(crypt_src, bp, len, ks, key, 1);
 #ifdef notdef    
     for (i = 0; i < len; i++) {
        printf("%02.2x ", (unsigned char)bp[i]);
@@ -180,8 +173,8 @@ set_password(first, last, idnumber, hashidnumber, password)
     char buf[1024];
     int version = ntohl((u_long)1);
     int call = ntohl((u_long)UREG_SET_PASSWORD);
-    C_Block key;
-    Key_schedule ks;
+    des_cblock key;
+    des_key_schedule ks;
     register char *bp = buf;
     register int len;
     
@@ -219,9 +212,9 @@ set_password(first, last, idnumber, hashidnumber, password)
     cbp += len;
 
     len = cbp - crypt_src;
-    string_to_key(hashidnumber, key);
-    key_sched(key, ks);
-    pcbc_encrypt(crypt_src, bp, len, ks, key, 1);
+    des_string_to_key(hashidnumber, key);
+    des_key_sched(key, ks);
+    des_pcbc_encrypt(crypt_src, bp, len, ks, key, 1);
 #ifdef notdef    
     for (i = 0; i < len; i++) {
        printf("%02.2x ", (unsigned char)bp[i]);
@@ -253,7 +246,7 @@ static do_call(buf, len, seq_no, login)
 
        FD_ZERO(&set);
        FD_SET(reg_sock, &set);
-       timeout.tv_sec = 45;
+       timeout.tv_sec = 30;
        timeout.tv_usec = 0;
        do {
            int rtn;
@@ -290,14 +283,3 @@ static do_call(buf, len, seq_no, login)
     } while (++retry < 10);
     return ETIMEDOUT;
 }    
-
-/*
- * Local Variables:
- * mode: c
- * c-indent-level: 4
- * c-continued-statement-offset: 4
- * c-brace-offset: -4
- * c-argdecl-indent: 4
- * c-label-offset: -4
- * End:
- */