- Removed most of the pam code into its own file auth-pam.[ch]. This

[openssh.git] / ssh.h

diff --git a/ssh.h b/ssh.h
index 0ec608f0b89e363ca169c6638b42ce8099ad935e..d62a9e1e148be67db9c4ad0035cb5d660ad8aa75 100644 (file)
--- a/ssh.h
+++ b/ssh.h
@@ -21,7 +21,9 @@
 #include <netinet/in.h> /* For struct sockaddr_in */
 #include <pwd.h> /* For struct pw */
 #include <stdarg.h> /* For va_list */
-
+#ifdef HAVE_SYS_SELECT_H
+# include <sys/select.h>
+#endif
 #include "rsa.h"
 #include "cipher.h"
 
@@ -589,7 +591,7 @@ char   *channel_open_message(void);
  */
 void 
 channel_request_local_forwarding(u_short port, const char *host,
-    u_short remote_port);
+    u_short remote_port, int gateway_ports);
 
 /*
  * Initiate forwarding of connections to port "port" on remote host through
@@ -633,7 +635,7 @@ char   *x11_create_display(int screen);
  * Returns a suitable value for the DISPLAY variable, or NULL if an error
  * occurs.
  */
-char   *x11_create_display_inet(int screen);
+char   *x11_create_display_inet(int screen, int x11_display_offset);
 
 /*
  * This is called when SSH_SMSG_X11_OPEN is received.  The packet contains
@@ -739,4 +741,8 @@ char   *skey_fake_keyinfo(char *username);
 int    auth_skey_password(struct passwd * pw, const char *password);
 #endif                         /* SKEY */
 
+#ifdef USE_PAM
+#include "auth-pam.h"
+#endif /* USE_PAM */
+
 #endif                         /* SSH_H */