import openssh-4.6p1-gsskex-20070312.patch

1 files changed, 13 insertions, 13 deletions

diff --git a/sshconnect.h b/sshconnect.h
index e7c7a2b34..4e66bbffc 100644
--- a/sshconnect.h
+++ b/sshconnect.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: sshconnect.h,v 1.18 2005/12/06 22:38:28 reyk Exp $    */
+/* $OpenBSD: sshconnect.h,v 1.23 2006/08/03 03:34:42 deraadt Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -23,8 +23,6 @@
  * (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 {
@@ -54,16 +52,18 @@ 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