rcolebaugh / rpms / openssh

Forked from rpms/openssh 2 years ago
Clone
b58e57
diff -up openssh-5.9p1/Makefile.in.wIm openssh-5.9p1/Makefile.in
b58e57
--- openssh-5.9p1/Makefile.in.wIm	2011-08-05 22:15:18.000000000 +0200
b58e57
+++ openssh-5.9p1/Makefile.in	2011-09-12 16:24:18.643674014 +0200
b58e57
@@ -66,7 +66,7 @@ LIBSSH_OBJS=acss.o authfd.o authfile.o b
b58e57
 	cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \
b58e57
 	compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \
b58e57
 	log.o match.o md-sha256.o moduli.o nchan.o packet.o \
b58e57
-	readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \
b58e57
+	readpass.o rsa.o ttymodes.o whereIam.o xmalloc.o addrmatch.o \
b58e57
 	atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \
b58e57
 	monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \
b58e57
 	kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \
b58e57
diff -up openssh-5.9p1/log.h.wIm openssh-5.9p1/log.h
b58e57
--- openssh-5.9p1/log.h.wIm	2011-06-20 06:42:23.000000000 +0200
b58e57
+++ openssh-5.9p1/log.h	2011-09-12 16:34:52.984674326 +0200
b58e57
@@ -65,6 +65,8 @@ void     verbose(const char *, ...) __at
b58e57
 void     debug(const char *, ...) __attribute__((format(printf, 1, 2)));
b58e57
 void     debug2(const char *, ...) __attribute__((format(printf, 1, 2)));
b58e57
 void     debug3(const char *, ...) __attribute__((format(printf, 1, 2)));
b58e57
+void	 _debug_wIm_body(const char *, int, const char *, const char *, int);
b58e57
+#define	debug_wIm(a,b) _debug_wIm_body(a,b,__func__,__FILE__,__LINE__)
b58e57
 
b58e57
 
b58e57
 void	 set_log_handler(log_handler_fn *, void *);
b58e57
diff -up openssh-5.9p1/sshd.c.wIm openssh-5.9p1/sshd.c
b58e57
--- openssh-5.9p1/sshd.c.wIm	2011-06-23 11:45:51.000000000 +0200
b58e57
+++ openssh-5.9p1/sshd.c	2011-09-12 16:38:35.787816490 +0200
b58e57
@@ -140,6 +140,9 @@ int deny_severity;
b58e57
 
b58e57
 extern char *__progname;
b58e57
 
b58e57
+/* trace of fork processes */
b58e57
+extern int whereIam;
b58e57
+
b58e57
 /* Server configuration options. */
b58e57
 ServerOptions options;
b58e57
 
b58e57
@@ -666,6 +669,7 @@ privsep_preauth(Authctxt *authctxt)
b58e57
 		return 1;
b58e57
 	} else {
b58e57
 		/* child */
b58e57
+		whereIam = 1;
b58e57
 		close(pmonitor->m_sendfd);
b58e57
 		close(pmonitor->m_log_recvfd);
b58e57
 
b58e57
@@ -715,6 +719,7 @@ privsep_postauth(Authctxt *authctxt)
b58e57
 
b58e57
 	/* child */
b58e57
 
b58e57
+	whereIam = 2;
b58e57
 	close(pmonitor->m_sendfd);
b58e57
 	pmonitor->m_sendfd = -1;
b58e57
 
b58e57
@@ -1325,6 +1330,8 @@ main(int ac, char **av)
b58e57
 	Key *key;
b58e57
 	Authctxt *authctxt;
b58e57
 
b58e57
+	whereIam = 0;
b58e57
+
b58e57
 #ifdef HAVE_SECUREWARE
b58e57
 	(void)set_auth_parameters(ac, av);
b58e57
 #endif
b58e57
diff -up openssh-5.9p1/whereIam.c.wIm openssh-5.9p1/whereIam.c
b58e57
--- openssh-5.9p1/whereIam.c.wIm	2011-09-12 16:24:18.722674167 +0200
b58e57
+++ openssh-5.9p1/whereIam.c	2011-09-12 16:24:18.724674418 +0200
b58e57
@@ -0,0 +1,12 @@
b58e57
+
b58e57
+int whereIam = -1;
b58e57
+
b58e57
+void _debug_wIm_body(const char *txt, int val, const char *func, const char *file, int line)
b58e57
+{
b58e57
+	if (txt)
b58e57
+		debug("%s=%d, %s(%s:%d) wIm = %d, uid=%d, euid=%d", txt, val, func, file, line, whereIam, getuid(), geteuid());
b58e57
+	else
b58e57
+		debug("%s(%s:%d) wIm = %d, uid=%d, euid=%d", func, file, line, whereIam, getuid(), geteuid());
b58e57
+}
b58e57
+
b58e57
+