Your message dated Wed, 7 Feb 2007 11:17:22 +0100
with message-id <[EMAIL PROTECTED]>
has caused the Debian Bug report #410020,
regarding libssh-2-dev: Missing libssh/priv.h
to be marked as having been forwarded to the upstream software
author(s) [EMAIL PROTECTED]
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--- Begin Message ---
Hello,
Steven Blanchard reported this bug to the Debian bts:
> The header file libssh/priv.h is missing from the package. It is
> required by libssh/server.h. It appears to have been overlooked in
> Makefile.in's install routines from upsteam. Adding it to
> Makefile.in at line 92 worked on my machine.
I replied this:
> As far as I know, the file libssh/priv.h is voluntarily not distributed,
> to prevent users from accessing internal data.
> So in my opinion, the bug is that libssh/server.h includes libssh/priv.h.
Correct me if I'm wrong. If not, the attached patch seems to fix it. I can
commit it anytime.
--
Jean-Philippe Garcia Ballester
Index: include/libssh/priv.h
===================================================================
--- include/libssh/priv.h (revision 108)
+++ include/libssh/priv.h (working copy)
@@ -365,6 +365,63 @@
unsigned char *echo; /* bool array */
char **answers;
};
+
+/* server data */
+
+struct ssh_bind_struct {
+ struct error_struct error;
+ int bindfd;
+ SSH_OPTIONS *options;
+ int blocking;
+ int toaccept;
+};
+
+struct ssh_auth_request {
+ char *username;
+ int method;
+ char *password;
+};
+
+struct ssh_channel_request_open {
+ int type;
+ u32 sender;
+ u32 window;
+ u32 packet_size;
+ char *originator;
+ u16 orignator_port;
+ char *destination;
+ u16 destination_port;
+};
+
+struct ssh_channel_request {
+ int type;
+ CHANNEL *channel;
+ u8 want_reply;
+ /* pty-req type specifics */
+ char *TERM;
+ u32 width;
+ u32 height;
+ u32 pxwidth;
+ u32 pxheight;
+ STRING *modes;
+
+ /* env type request */
+ char *var_name;
+ char *var_value;
+ /* exec type request */
+ char *command;
+ /* subsystem */
+ char *subsystem;
+};
+
+struct ssh_message {
+ SSH_SESSION *session;
+ int type;
+ struct ssh_auth_request auth_request;
+ struct ssh_channel_request_open channel_request_open;
+ struct ssh_channel_request channel_request;
+};
+
/* session.c */
void ssh_cleanup(SSH_SESSION *session);
Index: include/libssh/server.h
===================================================================
--- include/libssh/server.h (revision 108)
+++ include/libssh/server.h (working copy)
@@ -22,17 +22,8 @@
#define SERVER_H
#include "libssh/libssh.h"
-#include "libssh/priv.h"
#define SERVERBANNER CLIENTBANNER
-struct ssh_bind_struct {
- struct error_struct error;
- int bindfd;
- SSH_OPTIONS *options;
- int blocking;
- int toaccept;
-};
-
typedef struct ssh_bind_struct SSH_BIND;
SSH_BIND *ssh_bind_new();
@@ -58,27 +49,10 @@
#define SSH_AUTH_KEYBINT (1<<4)
#define SSH_AUTH_UNKNOWN 0
-struct ssh_auth_request {
- char *username;
- int method;
- char *password;
-};
-
-
#define SSH_CHANNEL_SESSION 1
#define SSH_CHANNEL_TCPIP 2
#define SSH_CHANNEL_X11 3
#define SSH_CHANNEL_UNKNOWN 4
-struct ssh_channel_request_open {
- int type;
- u32 sender;
- u32 window;
- u32 packet_size;
- char *originator;
- u16 orignator_port;
- char *destination;
- u16 destination_port;
-};
#define SSH_CHANNEL_REQUEST_PTY 1
#define SSH_CHANNEL_REQUEST_EXEC 2
@@ -88,35 +62,6 @@
#define SSH_CHANNEL_REQUEST_WINDOW_CHANGE 6
#define SSH_CHANNEL_REQUEST_UNKNOWN 7
-struct ssh_channel_request {
- int type;
- CHANNEL *channel;
- u8 want_reply;
- /* pty-req type specifics */
- char *TERM;
- u32 width;
- u32 height;
- u32 pxwidth;
- u32 pxheight;
- STRING *modes;
-
- /* env type request */
- char *var_name;
- char *var_value;
- /* exec type request */
- char *command;
- /* subsystem */
- char *subsystem;
-};
-
-struct ssh_message {
- SSH_SESSION *session;
- int type;
- struct ssh_auth_request auth_request;
- struct ssh_channel_request_open channel_request_open;
- struct ssh_channel_request channel_request;
-};
-
typedef struct ssh_message SSH_MESSAGE;
SSH_MESSAGE *ssh_message_get(SSH_SESSION *session);
Index: libssh/server.c
===================================================================
--- libssh/server.c (revision 108)
+++ libssh/server.c (working copy)
@@ -32,6 +32,7 @@
#include <errno.h>
#include <string.h>
#include <stdlib.h>
+#include "libssh/priv.h"
#include "libssh/libssh.h"
#include "libssh/server.h"
#include "libssh/ssh2.h"
pgpI8kpsj8UsA.pgp
Description: PGP signature
--- End Message ---
