Compilation error on Solaris Workshop 6 (+patch)

[Alexander Ignatyev]

Hi!

At compilation of the openssh-2.9.9p2 with Solaris WorkShop 6.01 the
following compilation error was given out.  

/opt/SUNWspro/bin/cc -Xa -xF -xCC -xildoff -xarch=v9 -xchip=ultra
-dalign -I/usr/include/v9 -D_REENTRANT -xO2 -I. -I.
-I/usr/local/include -DETCDIR=\"/etc/ssh\"
-D_PATH_SSH_PROGRAM=\"/usr/local/bin/ssh\"
-D_PATH_SSH_ASKPASS_DEFAULT=\"/usr/local/sbin/ssh-askpass\"
-D_PATH_SFTP_SERVER=\"/usr/local/sbin/sftp-server\"
-D_PATH_SSH_PIDDIR=\"/var/run\" -DHAVE_CONFIG_H -c session.c
"session.c", line 628: identifier redeclared: do_pre_login
        current : static function(pointer to struct Session {int used,
int self, pointer to struct passwd {..} pw, pointer to struct Authctxt
{..} authctxt, int pid, pointer to char term, int ptyfd, int ttyfd, int
ptymaster, int row, int col, int xpixel, int ypixel, array[64] of char
tty, pointer to char display, int screen, pointer to char auth_proto,
pointer to char auth_data, int single_connection, int chanid, int
is_subsystem}) returning void
        previous: function() returning int : "session.c", line 581
cc: acomp failed for session.c
*** Error code 2
make: Fatal error: Command failed for target `session.o'


To correct a compilation error it is necessary to make the following
changes (just define function do_pre_login):
================================== %<
===================================================
--- session.c-orig  Tue Oct 23 11:13:06 2001
+++ session.c-patched   Tue Oct 23 11:19:54 2001
@@ -132,6 +132,9 @@
 void   do_child(Session *, const char *);
 void   do_motd(void);
 int    check_quietlogin(Session *, const char *);
+#ifdef LOGIN_NEEDS_UTMPX
+static void do_pre_login(Session *s);
+#endif

 static void do_authenticated1(Authctxt *);
 static void do_authenticated2(Authctxt *);
================================== %<
===================================================

WBR,
Alexander Ignatyev
AI-RIPE
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 3197 bytes
Desc: not available
Url : http://lists.mindrot.org/pipermail/openssh-unix-dev/attachments/20011023/401f75d7/attachment.bin