<< | Thread Index | >> ]    [ << | Date Index | >> ]

To: cipe-l,AT,inka,DOT,de
Subject: Patch for 2.6.14.2
From: Keith Smith <keith,AT,ksmith,DOT,com>
Date: Tue, 22 Nov 2005 16:24:58 -0700

I've got a patch also

It includes my foreground (-f) patches.

This is available at http://www.ksmith.com/cipe-1.6.0-1.6.0-2.diff
diff -burN cipe-1.6.0/Checksums cipe-1.6.0-2/Checksums
--- cipe-1.6.0/Checksums        2004-08-04 06:54:53.000000000 -0700
+++ cipe-1.6.0-2/Checksums      1969-12-31 17:00:00.000000000 -0700
@@ -1,99 +0,0 @@
-# This file contains a list of the files in this package with checksums.
-# If you run this as a /bin/sh script, it will verify the PGP signature on
-# this file and verify the individual files' checksums.
-#
-# Packaged by olaf@bigred, Wed Aug  4 15:54:49 2004
-:<<'_marker_'
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-___size ____date_time _____________________________md5  
name___________________
-   1609 20040804-1551 174abf5abb87d9ab579df743e1238ee9  README
-   1170 20040804-1554 f4936080274795738bd1edf47e3602fd  README.key-bug
-   2657 20040803-1737 412c0e607122d1c24d1d9d0656ad532a  CHANGES
-  17982 19980922-2026 8ca43cbc842c2336e835926c2166c28b  COPYING
-    445 20040804-1549 014e64097522a2389860ffe6b4217b16  cipe.lsm
-  63576 20040804-1554 6e0f29a60baa95fce62eefadb9cc104a  configure
-  12181 20040804-1551 23caf105d7d03d1ded48f24a181b1d3e  configure.in
-  74422 20040803-1021 d61b2fe2b75d21d048093b17e5bbeaca  cipe.texinfo
-   1434 20000802-1633 90f5ddc57a4d353974b704cfe3b0e8a1  tcpdump.patch
-   1615 20040804-1554 c1bab98246373661e39fff9ddb6bab2e  cipe.spec
-   3468 20030510-2207 7451484a77ee8958b2f4a16540bba9d4  conf/Makefile-top.in
-   2951 20040118-1557 912df176b21c632b1a8864f4470117cf  conf/Makefile-obj.in
-   2419 20010522-1443 54e19b018ab51ba22b3364b297ba481a  conf/aclocal.m4
-   1824 20040306-2316 adbf923d0c44acd65b9234d630fa3ad7  conf/config.h.in
-   1436 20001231-0002 584cd4be77550875ae8fde4ebae3bfa1  lib/Makefile.in
-    276 20001216-1849 a9a795f9caff723c50a812dbcd13f7f6  lib/README
-   1724 20001213-0238 d892121d21d3577889b21385da574b85  lib/cipe_syslog.c
-   4258 20001231-0002 2d598c2cb8dea918aea32769d95d4c5c  lib/cipelib.h
-    709 20001122-2123 77babd74b9eed7c489efee7f0dda3d17  lib/debug.c
-    863 20020530-1340 b331323886608e553e05eb62ba950078  lib/dsprintf.c
-   1604 20001122-2123 b54a63787f854c5b5dbbfe9e237f0aeb  lib/getaddr.c
-    950 20001120-2323 02c9e3ee23150ea2127f91afbab96582  lib/gethex.c
-    485 20001117-1459 f6d33e6638ab85ac62843e5ed22f8351  lib/hex.c
-   1398 20010212-0125 def1d0161d5643cdc33b96e749f24640  lib/hexdump.c
-   1288 20001213-0238 74252d04bea0ab24c7146fb7336cd30b  lib/hexstr.c
-    838 20001120-2323 b46dd4583b6f83faa52a34f98f536b35  lib/parseopt.c
-    884 20001117-1459 0403fb103dc1c1d7482bc3e7513a9ce2  lib/retstatus.c
-   1487 20001231-0002 945027f15d8dd476b50f2bbe7ebc89a6  lib/secchk.c
-    943 20001130-2312 f81276bbd1f409e11031ec1bd46c407b  lib/setsig.c
-    527 20001117-1459 61bd67e5c874ea1760f7dd0db1894714  lib/sighand.c
-   1363 20001122-2123 020d88bd9f581b207dc0037d595ef151  lib/socks5_cmd.c
-   1072 20001205-2021 f117bc8b89ab980b0328109ebb5ba1c5  lib/socks5_internal.h
-   2071 20020530-1340 bdc14fde4290b8e71ced9790b158bfa2  lib/socks5_open.c
-    739 20001120-2323 3e751ad7e915282f3f562727a57d70a5  lib/socks_errlist.c
-    647 20001130-2312 b5a668cc115c6c49e2839d6973b00229  lib/xread.c
-    655 20001130-2312 fce3f5a7a7cca9adea256ea97af20e93  lib/xwrite.c
-    851 20001213-0238 a67e99e7e5b5102f6bf9ad01634568c8  lib/xwritev.c
-  13895 20040804-1551 eb49ad222bedd264e6d05455868e5096  cipe/cipe.h
-   3306 20040803-1021 3b44bb54e4ef18a368705fc534131e25  cipe/cryptoapi.h
-  27868 20040118-1557 fec354b56dafd0059659d81e2456572a  cipe/ciped.c
-   1051 20001216-1849 593831fecd8fd884bcee9b446b00131b  cipe/ciped.h
-   1727 20020530-1340 f0905a47d716e64b57a318386cdfee17  cipe/ioctl.c
-    959 20000327-1938 d12328ccb688ec53bee8a04775cf53a7  cipe/ioctl.h
-   3712 20040804-1551 01d5d653bdc931ead4b5a77c77afa9b6  cipe/options.in
-   1250 20011229-2123 f476286e52f4d77fc0d59e8189f377bd  cipe/genoptions.pl
-   2382 20040104-2131 1a5f0b38a1c71198d6d116f6e0526a9d  cipe/module.c
-  19411 20040803-1021 f78516f9da485ab231d785eff09599f7  cipe/device.c
-  20582 20040306-2316 04b396deab7f41fbc02d71b0d80f9485  cipe/sock.c
-  20234 20040306-2316 63e807eaa2497d7c718260428de197f6  cipe/output.c
-   5614 20040306-2316 a7331b80210a58a272701e8e4910a582  cipe/encaps.c
-   3258 20040803-1021 be981312351b8d1acaf50a4f7f271dbc  cipe/lebf.c
-   2889 20030115-2301 152bcf31f7280dd461aac8afa6a1b2a2  cipe/bf.h
-  21451 20030115-2301 7875184387fe78c1c805f134c2a58cf3  cipe/bf.c
-   7069 20040118-1557 ccc9b8c75bbdf7a0ee736267758e9298  cipe/crc32.c
-   1132 20040118-1557 8f830bebebd0c5aae3cc510c778e4d8b  cipe/crcgen.c
-   5852 20030301-2354 1abdcf937f78b2939255b669eede4420  cipe/bf-i386.S
-   2178 19961013-1819 607f582afdf7cb5f99d20b0b9137477f  cipe/thruput.c
-   2069 20030510-2207 771d7f5071645320ef5966402c98cdca  pkcipe/Makefile.in
-   9064 20010214-2121 77e1acfd8f34382d54aece33c13ba03b  
pkcipe/PKCIPE-Protocol
-   4968 20011118-1927 c5ea91bd4b0161a0425a4424d36f5ea8  pkcipe/README
-    961 20010214-2121 d1481cb41c06dfe8213cd5a5dfc89942  pkcipe/config.h.in
-   1533 20001109-0059 b4ba2cd9e127ba353d95d7d569384eda  pkcipe/dhkey.h
-   4467 20030722-2135 cc30fdc388955a3bf4246781986f02eb  pkcipe/lock.c
-   6433 20030510-2207 a06909ee7b5ce538e794ff23f2cf4a8a  pkcipe/main.c
-   4896 20020510-1931 ac175375105a4f4576df5b0e45f8dad5  pkcipe/negotiate.c
-   2530 20020530-1340 fb36f0d7b730879cfb6065a426e03c04  pkcipe/p_sha1.c
-   6504 20020530-1340 e1526358e2d5733334f8986fde07e908  pkcipe/packet.c
-   3828 20020510-1931 4851adf284d4c2556503b73e11ca1acc  pkcipe/pkcipe.h
-  11751 20030510-2207 dc36751316fa72a44f62234d4c29c9a8  pkcipe/proto.c
-   1142 20010120-1846 7db578ebfcd81c3a2e11f0d952b5fecf  pkcipe/rsa-keygen.in
-     55 19961009-0116 3e202bcd35450045391894a1b85077a8  samples/README
-    682 19990303-1253 5ce6004ee6a973b6d6c556fb08724dff  samples/options
-   2001 20020530-1340 4b8c33e9e9deb4d00fe952c48dfb5f00  samples/ip-up
-    604 20020530-1340 b82bb7d225f9b5e38a3de85092c771ef  samples/ip-down
-___size ____date_time _____________________________md5  
name___________________
-
-_marker_
-echo "No output after the PGP signature check means everything is okay."
-test `which gpg` && pgp="gpg" || pgp="pgp -tf"
-$pgp <$0 | sed '/^_marker_/q;/^_/d' | tr -d "\r" | cut -b23- | md5sum -c
-exit $?
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.0.6 (GNU/Linux)
-Comment: For info see http://www.gnupg.org
-
-iEYEARECAAYFAkEQ6q0ACgkQGPw4gdAdiZ1VxgCfdoou5GZw/j088ghGSe85yfv2
-PMoAmQFQwBuDCF547qNU40NYlSaEnrWF
-=z8ew
------END PGP SIGNATURE-----
diff -burN cipe-1.6.0/cipe/cipe.h cipe-1.6.0-2/cipe/cipe.h
--- cipe-1.6.0/cipe/cipe.h      2004-08-04 06:51:14.000000000 -0700
+++ cipe-1.6.0-2/cipe/cipe.h    2005-03-11 08:50:54.000000000 -0700
@@ -271,7 +271,10 @@
 #endif
 
 #ifdef LINUX_25
+#ifdef CURRENT_TIME_SEC
+#undef CURRENT_TIME_SEC
 #define CURRENT_TIME_SEC (xtime.tv_sec)
+#endif
 #define ip_send          dst_output
 #else
 #define CURRENT_TIME_SEC (CURRENT_TIME)
@@ -346,7 +349,7 @@
 #ifdef LINUX_25
     struct inet_sock    *sock;
 #define SOCK(c) ((struct sock*)((c)->sock))
-#define IOPT(c) (&(c)->sock->inet)
+#define IOPT(c) ((c)->sock)
 #else
     struct sock         *sock;
 #define SOCK(c) ((c)->sock)
diff -burN cipe-1.6.0/cipe/ciped.c cipe-1.6.0-2/cipe/ciped.c
--- cipe-1.6.0/cipe/ciped.c     2004-01-18 07:57:51.000000000 -0700
+++ cipe-1.6.0-2/cipe/ciped.c   2005-03-12 23:34:23.000000000 -0700
@@ -924,7 +924,7 @@
 
 int main(int argc, char *argv[])
 {
-    int i=1, ur, fd, sd=-1, isup, errcnt;
+    int i=1, ur, fd, sd=-1, isup, errcnt, foreground=0;
     pid_t pa=0;
     char pidfile[128]="";
     char *st;
@@ -952,8 +952,9 @@
     /* Snarf options from: standard options file, user-supplied file and
        finally, command line */
     setopt_file(CTLDIR "/options", 0);
-    while ((i=getopt(argc, argv, "is:S:o:"))!=EOF) {
+    while ((i=getopt(argc, argv, "fis:S:o:"))!=EOF) {
         switch(i) {
+        case 'f': foreground=1; break;
         case 'i': inetd=1; break;
        case 's': usesock=atoi(optarg); break;
        case 'S': sd=atoi(optarg); break;
@@ -980,6 +981,7 @@
        gotsig=0;
        setsig(SIGUSR1, sighandexit);
        setsig(SIGCHLD, sighand);
+    if(foreground == 0) {
        if ((i=fork())<0) {
            perror("fork"); exit(1);
        }
@@ -996,6 +998,7 @@
         /* re-lock after fork */
         xmlock(LM, sizeof(struct lockmem));
         pa=getppid();
+    }
        close(0); close(1); close(2);
        setsid();
        syslog(LOG_INFO, "CIPE daemon vers %s (c) Olaf Titz 1996-2003",
diff -burN cipe-1.6.0/cipe/cryptoapi.h cipe-1.6.0-2/cipe/cryptoapi.h
--- cipe-1.6.0/cipe/cryptoapi.h 2004-08-03 01:21:17.000000000 -0700
+++ cipe-1.6.0-2/cipe/cryptoapi.h       2005-11-22 08:03:27.000000000 -0700
@@ -90,10 +90,12 @@
 
 #endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) || !defined(HAVE_CRYPTO_H)
 static inline void *crypto_tfm_ctx(struct crypto_tfm *tfm)
 {
     return (void *)&tfm[1];
 }
+#endif
 
 static inline void crypto_cipher_encrypt_blk(struct crypto_tfm *tfm,
                                              u8 *dst,
diff -burN cipe-1.6.0/cipe/device.c cipe-1.6.0-2/cipe/device.c
--- cipe-1.6.0/cipe/device.c    2004-08-03 01:21:17.000000000 -0700
+++ cipe-1.6.0-2/cipe/device.c  2005-11-22 08:17:27.000000000 -0700
@@ -441,7 +441,9 @@
        dprintk(DEB_CALL, (KERN_INFO "%s: closing\n", c->dev->name));
        /* Tell the attached socket we're going down */
        SOCK(c)->sk_shutdown=SHUTDOWN_MASK;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
        SOCK(c)->sk_zapped=1;
+#endif
        SOCK(c)->sk_err=ENXIO;
        SOCK(c)->sk_error_report(SOCK(c));
 #ifdef LINUX_21
diff -burN cipe-1.6.0/cipe/lebf.c cipe-1.6.0-2/cipe/lebf.c
--- cipe-1.6.0/cipe/lebf.c      2004-08-03 01:21:17.000000000 -0700
+++ cipe-1.6.0-2/cipe/lebf.c    2005-11-22 07:51:30.000000000 -0700
@@ -17,7 +17,7 @@
 
 int lebf_cra_setkey(void *ctx, const u8 *key, unsigned int keylen, u32 
*flags)
 {
-    printk(KERN_DEBUG "lebf_cra_setkey: ctx=%p\n", ctx);
+    dprintk(DEB_CRYPT, (KERN_DEBUG "lebf_cra_setkey: ctx=%p\n", ctx));
     Blowfish_ExpandUserKey(key, keylen, ctx);
     return 0;
 }
@@ -25,7 +25,7 @@
 int lebf_cit_setkey(struct crypto_tfm *tfm,
                     const u8 *key, unsigned int keylen)
 {
-    printk(KERN_DEBUG "lebf_cit_setkey: tfm=%p ctx=%p\n", tfm, 
crypto_tfm_ctx(tfm));
+    dprintk(DEB_CRYPT, (KERN_DEBUG "lebf_cit_setkey: tfm=%p ctx=%p\n", tfm, 
crypto_tfm_ctx(tfm)));
     Blowfish_ExpandUserKey(key, keylen, crypto_tfm_ctx(tfm));
     return 0;
 }
@@ -59,7 +59,7 @@
 
 struct crypto_tfm *cipe_alloc_tfm(const char *alg_name, u32 tfm_flags)
 {
-    printk(KERN_DEBUG "cipe_alloc_tfm '%s'\n", alg_name);
+    dprintk(DEB_CRYPT, (KERN_DEBUG "cipe_alloc_tfm '%s'\n", alg_name));
     if (!alg_name || !*alg_name || !strcmp(alg_name, "blowfish-internal")) {
         struct crypto_tfm *tfm;
         tfm=kmalloc(sizeof(*tfm)+sizeof(Blowfish_Key), GFP_KERNEL);
@@ -67,7 +67,7 @@
             tfm->crt_cipher = LEBF_CIPHER;
             tfm->__crt_alg = &LEBF_ALG;
         }
-        printk(KERN_DEBUG "cipe_alloc_tfm: tfm=%p\n", tfm);
+        dprintk(DEB_CRYPT,(KERN_DEBUG "cipe_alloc_tfm: tfm=%p\n", tfm));
         return tfm;
     }
 #ifdef USE_CRYPTOAPI
@@ -111,4 +111,3 @@
     _N_Blowfish_Encrypt(buf, buf, padkey);
     /* it doesn't matter if we use big or little endian here */
 }
-
diff -burN cipe-1.6.0/cipe/output.c cipe-1.6.0-2/cipe/output.c
--- cipe-1.6.0/cipe/output.c    2004-03-06 15:16:41.000000000 -0700
+++ cipe-1.6.0-2/cipe/output.c  2005-11-22 15:52:53.000000000 -0700
@@ -9,7 +9,7 @@
    modify it under the terms of the GNU General Public License
    as published by the Free Software Foundation; either version
    2 of the License, or (at your option) any later version.
-*/
+ */
 /* $Id: output.c,v 1.52 2004/03/06 22:16:41 olaf81825 Exp $ */
 
 #include "cipe.h"
@@ -210,7 +210,7 @@
        if (tunnel->flags&CIPF_FORCE_MTU) {
                mtu = dev->mtu;
        } else {
-               mtu = dst_pmtu(&rt->u.dst) - (cipehdrlen+cipefootlen);
+        mtu = dst_mtu(&rt->u.dst) - (cipehdrlen+cipefootlen);
                if (tunnel->sockshost)
                        mtu -= sizeof(struct sockshdr);
         }
@@ -382,9 +382,9 @@
         tunnel->recursion--;
        return 0;
 
- tx_error:
+tx_error:
         ip_rt_put(rt);
- tx_error_out:
+tx_error_out:
        tunnel->stat.tx_errors++;
        dev_kfree_skb(skb);
        tunnel->recursion--;
@@ -396,20 +396,20 @@
 /* An adapted version of Linux 2.0 drivers/net/new_tunnel.c. */
 
 #ifdef SO_BINDTODEVICE
-  #define iproute(t,o,d) ip_rt_route(t,o,d)
+#define iproute(t,o,d) ip_rt_route(t,o,d)
 #else
-  #define iproute(t,o,d) ip_rt_route(t,o)
+#define iproute(t,o,d) ip_rt_route(t,o)
 #endif
 
 #if LINUX_VERSION_CODE < 131102  /* < 2.0.30 */
-  #include <linux/config.h>
-  #ifdef CONFIG_IP_FORWARD
-    #define ipforward(s,d,o,t) ip_forward(s,d,o,t)
-  #else
-    #error "Requires IP forwarding enabled in kernel"
-  #endif
+#include <linux/config.h>
+#ifdef CONFIG_IP_FORWARD
+#define ipforward(s,d,o,t) ip_forward(s,d,o,t)
+#else
+#error "Requires IP forwarding enabled in kernel"
+#endif
 #else                            /* >= 2.0.30 */
-  #define ipforward(s,d,o,t) (sysctl_ip_forward ? ip_forward(s,d,o,t) : -1)
+#define ipforward(s,d,o,t) (sysctl_ip_forward ? ip_forward(s,d,o,t) : -1)
 #endif
 
 int cipe_xmit(struct sk_buff *skb, struct NET_DEVICE *dev)
@@ -647,7 +647,7 @@
        dev->tbusy=0;
        return 0;
 
-    error:
+error:
        stats->tx_errors++;
        dev_kfree_skb(skb, FREE_WRITE);
        dev->tbusy=0;
diff -burN cipe-1.6.0/cipe/sock.c cipe-1.6.0-2/cipe/sock.c
--- cipe-1.6.0/cipe/sock.c      2004-03-06 15:16:41.000000000 -0700
+++ cipe-1.6.0-2/cipe/sock.c    2005-11-22 15:46:48.000000000 -0700
@@ -317,9 +317,13 @@
             goto error;
         }
 
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
+        get_fast_time((struct timeval *)&(n->tstamp));
+#else
 #ifdef LINUX_21
        get_fast_time(&n->stamp);
 #endif
+#endif
        /* No checkpeer() here because not authenticated! */
        n->h.uh->check=0;
        return n;
@@ -346,9 +350,13 @@
            /* return it as key exchange block - proper UDP datagram */
            dprintk(DEB_INP, (KERN_DEBUG "TW_NEWKEY data=%p len=" FLEN
                               " length=%d\n", n->data, n->len, length));
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
+        get_fast_time((struct timeval *)&(n->tstamp));
+#else
 #ifdef LINUX_21
            get_fast_time(&n->stamp);
 #endif
+#endif
            skb_trim(n, length);
            checkpeer(c, rsaddr, rsport);
 #if 0
@@ -509,7 +517,12 @@
 #else
        memcpy_toiovec(msg->msg_iov, skb->data, copied);
 #endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
        sk->sk_stamp=skb->stamp;
+#else
+       memcpy(&(sk->sk_stamp),&(skb->tstamp),sizeof(struct timeval));
+#endif
 
        /* Copy the address. */
        if (sin
@@ -554,7 +567,7 @@
     if (!(file=fget(parm->fd)))
         return(-EBADF);
     inode = file->f_dentry->d_inode;
-    if (!inode || !inode->i_sock || !(sock=SOCKET_I(inode))) {
+    if (!inode || !S_ISSOCK(inode->i_mode) || !(sock=SOCKET_I(inode))) {
         fput(file);
         return(-ENOTSOCK);
     }
diff -burN cipe-1.6.0/conf/Makefile-obj.in cipe-1.6.0-2/conf/Makefile-obj.in
--- cipe-1.6.0/conf/Makefile-obj.in     2004-01-18 07:57:51.000000000 -0700
+++ cipe-1.6.0-2/conf/Makefile-obj.in   2005-03-12 23:57:05.000000000 -0700
@@ -9,8 +9,8 @@
 
 # $Id: Makefile-obj.in,v 1.22 2004/01/18 14:57:51 olaf81825 Exp $
 
-BINDIR:=/usr/local/sbin
-MODDIR:=/lib/modules/@KVERS@/misc
+BINDIR:=$(TARGET_DIR)/usr/local/sbin
+MODDIR:=$(TARGET_DIR)/lib/modules/@KVERS@/misc
 
 MAKE=     @MAKE@
 CC=       @CC@
@@ -119,4 +119,3 @@
 all25: version.h $(CIPED)
        $(MAKE) -C $(KSRC) O=$(KOBJ) SUBDIRS=$(obj) modules
 endif
-
diff -burN cipe-1.6.0/conf/Makefile-top.in cipe-1.6.0-2/conf/Makefile-top.in
--- cipe-1.6.0/conf/Makefile-top.in     2003-05-10 13:07:44.000000000 -0700
+++ cipe-1.6.0-2/conf/Makefile-top.in   2005-03-12 23:57:18.000000000 -0700
@@ -8,8 +8,7 @@
 #   2 of the License, or (at your option) any later version.
 
 # $Id: Makefile-top.in,v 1.20 2003/05/10 20:07:44 olaf81825 Exp $
-
-INFODIR:=/usr/local/info
+INFODIR:=$(TARGET_DIR)/usr/local/info
 
 SRC:=  cipe
 VERSION:=@VERSION@
diff -burN cipe-1.6.0/pkcipe/Makefile.in cipe-1.6.0-2/pkcipe/Makefile.in
--- cipe-1.6.0/pkcipe/Makefile.in       2003-05-10 13:07:44.000000000 -0700
+++ cipe-1.6.0-2/pkcipe/Makefile.in     2005-03-12 23:57:30.000000000 -0700
@@ -10,7 +10,7 @@
 # $Id: Makefile.in,v 1.13 2003/05/10 20:07:44 olaf81825 Exp $
 
 lib:=../lib
-prefix := @prefix@
+prefix := $(TARGET_DIR)@prefix@
 exec_prefix:= @exec_prefix@
 bindir := @bindir@
 sbindir        := @sbindir@
@@ -41,13 +41,13 @@
        -mkdir -p $(bindir) $(sbindir)
        $(INSTALL) -m 755 rsa-keygen $(bindir)
        $(INSTALL) -m 755 pkcipe $(sbindir)
-       [ -d /etc/cipe/pk ] || mkdir -p /etc/cipe/pk
-       [ -d /var/run/cipe ] || mkdir -p /var/run/cipe
-       chmod 700 /etc/cipe /etc/cipe/pk /var/run/cipe
-       @if [ ! -f /etc/cipe/identity.priv ] ; then \
-               echo "*** Generating new identity (host) key ***" ;\
-               rsa-keygen /etc/cipe/identity ;\
-       fi
+#      [ -d /etc/cipe/pk ] || mkdir -p /etc/cipe/pk
+#      [ -d /var/run/cipe ] || mkdir -p /var/run/cipe
+#      chmod 700 /etc/cipe /etc/cipe/pk /var/run/cipe
+#      @if [ ! -f /etc/cipe/identity.priv ] ; then \
+#              echo "*** Generating new identity (host) key ***" ;\
+#              rsa-keygen /etc/cipe/identity ;\
+#      fi
 
 clean:
        rm -f *.[oaisd] *.out core pkcipe
@@ -78,4 +78,3 @@
 -include $(DEPS)
 endif
 endif
-

<< | Thread Index | >> ]    [ << | Date Index | >> ]