Here are a couple of patches against the CVS (Jan 22 18:41 PST)
Some C++ comments found their way into ssh.h
The no64.patch puts ifdefs around buffer_get_int64()
now in bufaux.[c,h]
--
Tim Rice Multitalents (707) 887-1469
tim at multitalents.net
-------------- next part --------------
--- ssh.h.old Mon Jan 22 18:40:58 2001
+++ ssh.h Mon Jan 22 19:02:02 2001
@@ -25,8 +25,10 @@
# include <sys/select.h>
#endif
-//#include "rsa.h"
-//#include "cipher.h"
+/*
+#include "rsa.h"
+#include "cipher.h"
+*/
/* Cipher used for encrypting authentication files. */
#define SSH_AUTHFILE_CIPHER SSH_CIPHER_3DES
-------------- next part --------------
--- bufaux.c.old Mon Jan 22 18:40:22 2001
+++ bufaux.c Mon Jan 22 19:15:04 2001
@@ -152,6 +152,7 @@
return GET_32BIT(buf);
}
+#ifdef HAVE_U_INT64_T
u_int64_t
buffer_get_int64(Buffer *buffer)
{
@@ -159,6 +160,7 @@
buffer_get(buffer, (char *) buf, 8);
return GET_64BIT(buf);
}
+#endif
/*
* Stores an integer in the buffer in 4 bytes, msb first.
@@ -171,6 +173,7 @@
buffer_append(buffer, buf, 4);
}
+#ifdef HAVE_U_INT64_T
void
buffer_put_int64(Buffer *buffer, u_int64_t value)
{
@@ -178,6 +181,7 @@
PUT_64BIT(buf, value);
buffer_append(buffer, buf, 8);
}
+#endif
/*
* Returns an arbitrary binary string from the buffer. The string cannot
--- bufaux.h.old Mon Jan 22 18:40:22 2001
+++ bufaux.h Mon Jan 22 19:10:22 2001
@@ -31,11 +31,15 @@
/* Returns an integer from the buffer (4 bytes, msb first). */
u_int buffer_get_int(Buffer * buffer);
+#ifdef HAVE_U_INT64_T
u_int64_t buffer_get_int64(Buffer *buffer);
+#endif
/* Stores an integer in the buffer in 4 bytes, msb first. */
void buffer_put_int(Buffer * buffer, u_int value);
+#ifdef HAVE_U_INT64_T
void buffer_put_int64(Buffer *buffer, u_int64_t value);
+#endif
/* Returns a character from the buffer (0 - 255). */
int buffer_get_char(Buffer * buffer);
--- defines.h.old Mon Jan 22 18:40:32 2001
+++ defines.h Mon Jan 22 19:45:41 2001
@@ -171,20 +171,22 @@
#ifndef HAVE_INT64_T
# if (SIZEOF_LONG_INT == 8)
typedef long int int64_t;
+# define HAVE_INT64_T 1
# else
# if (SIZEOF_LONG_LONG_INT == 8)
typedef long long int int64_t;
-# define HAVE_INTXX_T 1
+# define HAVE_INT64_T 1
# endif
# endif
#endif
#ifndef HAVE_U_INT64_T
# if (SIZEOF_LONG_INT == 8)
typedef unsigned long int u_int64_t;
+# define HAVE_U_INT64_T 1
# else
# if (SIZEOF_LONG_LONG_INT == 8)
typedef unsigned long long int u_int64_t;
-# define HAVE_U_INTXX_T 1
+# define HAVE_U_INT64_T 1
# endif
# endif
#endif
CVS (Jan 22 18:41 PST)
Here is a small patch to build on SCO Open Server 3
Patched version of fake-regex.h works.
Added an #ifdef S_IFSOCK to bsd-strmode.c
Added -lintl to *-*-sco3.2v4*) LIBS list for strftime() in sftp-server.c
--
Tim Rice Multitalents (707) 887-1469
tim at multitalents.net
-------------- next part --------------
--- configure.in.old Mon Jan 22 18:40:30 2001
+++ configure.in Mon Jan 22 21:46:58 2001
@@ -211,7 +211,7 @@
LDFLAGS="$LDFLAGS -L/usr/local/lib"
MANTYPE='$(CATMAN)'
mansubdir=cat
- LIBS="$LIBS -lgen -lsocket -los -lprot -lx -ltinfo -lm"
+ LIBS="$LIBS -lgen -lsocket -los -lprot -lx -ltinfo -lm -lintl"
no_dev_ptmx=1
RANLIB=true
AC_DEFINE(BROKEN_SYS_TERMIO_H)
--- bsd-strmode.c.old Wed Jan 17 18:04:35 2001
+++ bsd-strmode.c Mon Jan 22 20:11:52 2001
@@ -64,9 +64,11 @@
case S_IFLNK: /* symbolic link */
*p++ = 'l';
break;
+#ifdef S_IFSOCK
case S_IFSOCK: /* socket */
*p++ = 's';
break;
+#endif
#ifdef S_IFIFO
case S_IFIFO: /* fifo */
*p++ = 'p';
--- fake-regex.h.old Fri Jan 19 09:11:43 2001
+++ fake-regex.h Mon Jan 22 21:26:21 2001
@@ -37,13 +37,12 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)regex.h 8.1 (Berkeley) 6/2/93
+ * @(#)regex.h 8.2 (Berkeley) 1/3/94
*/
#ifndef _REGEX_H_
#define _REGEX_H_
-#include <sys/cdefs.h>
#include <sys/types.h>
/* types */
@@ -99,12 +98,14 @@
#define REG_LARGE 01000 /* force large representation */
#define REG_BACKR 02000 /* force use of backref code */
-__BEGIN_DECLS
-int regcomp __P((regex_t *, const char *, int));
-size_t regerror __P((int, const regex_t *, char *, size_t));
-int regexec __P((const regex_t *,
- const char *, size_t, regmatch_t [], int));
-void regfree __P((regex_t *));
-__END_DECLS
-
+#ifdef __cplusplus
+extern "C" {
+#endif
+int regcomp(regex_t*, const char*, int);
+size_t regerror(int, const regex_t*, char*, size_t);
+int regexec(const regex_t*, const char*, size_t, regmatch_t[], int);
+void regfree(regex_t*);
+#ifdef __cplusplus
+}
+#endif
#endif /* !_REGEX_H_ */
Tim Rice wrote:> CVS (Jan 22 18:41 PST) > > Here is a small patch to build on SCO Open Server 3...........> Added -lintl to *-*-sco3.2v4*) LIBS list for strftime() in sftp-server.cNO! Add macro AC_FUNC_STRFTIME in configure.in>...........
On Mon, 22 Jan 2001, Tim Rice wrote:> > Here are a couple of patches against the CVS (Jan 22 18:41 PST) > > Some C++ comments found their way into ssh.h >Removed by Markus> The no64.patch puts ifdefs around buffer_get_int64() > now in bufaux.[c,h] >Applied.
Roumen Petrov wrote:> > patch + commands > - autoheaderautoconf> - ./config.status ( for existing build ) or ./configure ...
Roumen Petrov wrote:> Roumen Petrov wrote:....>> - ./config.status ( for existing build ) or ./configure ...oops ./config.status --recheck ( for existing build ) or ./configure ...
Folks: I have cvs loaded on a SCO OpenServer 5.0.5 box. I am trying to get openssh from Alberta (anoncvs at anoncvs.anoncvsl.ca.openbsd.org:/cvs) When I do the checkout, I get "broken pipe" error. I have set CVSROOT SHELL=/bin/rsh what am I missing, once I have ssh compiled and installed I will switch download method but until then... thank you murray
diff : ... - ret = chmod(name, a->perm & 077); + ret = chmod(name, a->perm & 0777); slackware has in sys/stat.h ..... # define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */ ..... idea: add to defines.h lines like this: #ifndef ACCESSPERMS # define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */ #endif pleace use in authfile.c and sftp-server.c this define instead of 0777 !
mouring at etoh.eviladmin.org
2001-Jan-25 14:09 UTC
about sftp-server.c from CVS 25 jan 2001
On Thu, 25 Jan 2001, Roumen Petrov wrote:> > diff : > ... > - ret = chmod(name, a->perm & 077); > + ret = chmod(name, a->perm & 0777); >This was pointed out and already corrected.> slackware has in sys/stat.hNot sure what your getting at. Is ./configure misdetecting this? - Ben
mouring at etoh.eviladmin.org wrote:> On Thu, 25 Jan 2001, Roumen Petrov wrote: > > >> diff : >> ... >> - ret = chmod(name, a->perm & 077); >> + ret = chmod(name, a->perm & 0777); >> > > This was pointed out and already corrected. > > >> slackware has in sys/stat.h > > > Not sure what your getting at. Is ./configure misdetecting this? >???? My idea is developers to use: ( S_IRWXG | S_IRWXO ) instead of 077 ( S_IRWXU | S_IRWXG | S_IRWXO ) 0777 or ( S_IRUSR | S_IWUSR ) 0600
In latest CVS source is _PATH_SSH_PROGRAM, but is not fixed in Makefile.in and in pathnames.h define is not enclosed in #ifndef....#endif ! William L. Jones wrote:> > The configuration script carefully set up a define for SSH_PROGRAM that > is not used. > I think this is an attempt to set the _SSH_PROGRAM variable. Does any > one know > what the original intent was. > > Bill Jones
mouring at etoh.eviladmin.org
2001-Jan-25 23:59 UTC
SSH_PROGRAM not used but _SSH_PROGRAM is
On Thu, 25 Jan 2001, Roumen Petrov wrote:> In latest CVS source is _PATH_SSH_PROGRAM, but is not fixed in Makefile.in and > in pathnames.h define is not enclosed in #ifndef....#endif ! >I think he was refering to something different, but I just fixed this. - Ben