- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / sshconnect.h

diff --git a/sshconnect.h b/sshconnect.h
index 48148833fd540962038a2bb5603116cf8be05427..c59a097f4eba62ffd5d3df34569bea4843b0828c 100644 (file)
--- a/sshconnect.h
+++ b/sshconnect.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: sshconnect.h,v 1.16 2002/06/11 04:14:26 markus Exp $  */
+/* $OpenBSD: sshconnect.h,v 1.25 2009/05/27 06:38:16 andreas Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -23,22 +23,22 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef SSHCONNECT_H
-#define SSHCONNECT_H
 
 typedef struct Sensitive Sensitive;
 struct Sensitive {
-       Key     **keys;
-       int     nkeys;
-       int     external_keysign;
+       Key     **keys;
+       int     nkeys;
+       int     external_keysign;
 };
 
 int
 ssh_connect(const char *, struct sockaddr_storage *, u_short, int, int,
-    int, const char *);
+    int *, int, int, const char *);
 
 void
-ssh_login(Sensitive *, const char *, struct sockaddr *, struct passwd *);
+ssh_login(Sensitive *, const char *, struct sockaddr *, struct passwd *, int);
+
+void    ssh_exchange_identification(int);
 
 int     verify_host_key(char *, struct sockaddr *, Key *);
 
@@ -49,21 +49,23 @@ void         ssh_userauth1(const char *, const char *, char *, Sensitive *);
 void    ssh_userauth2(const char *, const char *, char *, Sensitive *);
 
 void    ssh_put_password(char *);
-
+int     ssh_local_cmd(const char *);
 
 /*
  * Macros to raise/lower permissions.
  */
-#define PRIV_START do {                         \
-        int save_errno = errno;                 \
-        (void)seteuid(original_effective_uid);  \
-        errno = save_errno;                     \
+#define PRIV_START do {                                        \
+       int save_errno = errno;                         \
+       if (seteuid(original_effective_uid) != 0)       \
+               fatal("PRIV_START: seteuid: %s",        \
+                   strerror(errno));                   \
+       errno = save_errno;                             \
 } while (0)
 
-#define PRIV_END do {                           \
-        int save_errno = errno;                 \
-        (void)seteuid(original_real_uid);       \
-        errno = save_errno;                     \
+#define PRIV_END do {                                  \
+       int save_errno = errno;                         \
+       if (seteuid(original_real_uid) != 0)            \
+               fatal("PRIV_END: seteuid: %s",          \
+                   strerror(errno));                   \
+       errno = save_errno;                             \
 } while (0)
-
-#endif