=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tcfs/Attic/tcfs_keymaint.c,v retrieving revision 1.8 retrieving revision 1.9 diff -c -r1.8 -r1.9 *** src/usr.bin/tcfs/Attic/tcfs_keymaint.c 2000/06/19 22:42:28 1.8 --- src/usr.bin/tcfs/Attic/tcfs_keymaint.c 2000/06/19 23:06:25 1.9 *************** *** 1,4 **** ! /* $OpenBSD: tcfs_keymaint.c,v 1.8 2000/06/19 22:42:28 aaron Exp $ */ /* * Transparent Cryptographic File System (TCFS) for NetBSD --- 1,4 ---- ! /* $OpenBSD: tcfs_keymaint.c,v 1.9 2000/06/19 23:06:25 aaron Exp $ */ /* * Transparent Cryptographic File System (TCFS) for NetBSD *************** *** 51,57 **** int i; if (tcfs_verify_fs(filesystem)) ! i = mount("tcfs", filesystem, MNT_UPDATE, (void*)arg); else i = -1; --- 51,57 ---- int i; if (tcfs_verify_fs(filesystem)) ! i = mount("tcfs", filesystem, MNT_UPDATE, (void *)arg); else i = -1; *************** *** 62,68 **** tcfs_decrypt_key(char *pwd, u_char *t, u_char *tk, int tklen) { char pass[_PASSWORD_LEN]; ! char tcfskey[2*KEYSIZE], iv[8]; blf_ctx ctx; int len; --- 62,68 ---- tcfs_decrypt_key(char *pwd, u_char *t, u_char *tk, int tklen) { char pass[_PASSWORD_LEN]; ! char tcfskey[KEYSIZE * 2], iv[8]; blf_ctx ctx; int len; *************** *** 138,143 **** --- 138,144 ---- tcfs_user_enable(char *filesystem, uid_t user, u_char *key) { struct tcfs_args a; + a.user = user; memcpy(a.tcfs_key, key, sizeof(a.tcfs_key)); a.cmd = TCFS_PUT_UIDKEY; *************** *** 149,154 **** --- 150,156 ---- tcfs_user_disable(char *filesystem, uid_t user) { struct tcfs_args a; + a.user = user; a.cmd = TCFS_RM_UIDKEY; *************** *** 159,164 **** --- 161,167 ---- tcfs_proc_enable(char *filesystem, uid_t user, pid_t pid, char *key) { struct tcfs_args a; + a.user = user; a.cmd = TCFS_PUT_PIDKEY; a.proc = pid; *************** *** 171,176 **** --- 174,180 ---- tcfs_proc_disable(char *filesystem, uid_t user, pid_t pid) { struct tcfs_args a; + a.user = user; a.cmd = TCFS_RM_PIDKEY; a.proc = pid; *************** *** 183,188 **** --- 187,193 ---- int tre, char *key) { struct tcfs_args a; + a.cmd = TCFS_PUT_GIDKEY; a.user = uid; a.group = gid; *************** *** 195,205 **** int tcfs_group_disable(char *filesystem, uid_t uid, gid_t gid) { struct tcfs_args a; a.cmd = TCFS_RM_GIDKEY; a.user = uid; a.group = gid; return (tcfs_callfunction(filesystem, &a)); } - --- 200,210 ---- int tcfs_group_disable(char *filesystem, uid_t uid, gid_t gid) { struct tcfs_args a; + a.cmd = TCFS_RM_GIDKEY; a.user = uid; a.group = gid; return (tcfs_callfunction(filesystem, &a)); }