tags 409819 patch
thanks

attached is a diff which acomplishes the same as above.  Thanks to Glen
Batchelor for his help.

stew

diff -ruN snoopy-1.3/debian/patches/00list snoopy-1.3.mine/debian/patches/00list
--- snoopy-1.3/debian/patches/00list    2007-02-05 14:44:39.000000000 -0500
+++ snoopy-1.3.mine/debian/patches/00list       2007-02-05 14:35:41.000000000 
-0500
@@ -2,3 +2,4 @@
 20-Makefile-CFLAGS.dpatch
 30-Makefile-clean.dpatch
 40-Makefile-DESTDIR.dpatch
+50-getlogin_r.dpatch
diff -ruN snoopy-1.3/debian/patches/50-getlogin_r.dpatch 
snoopy-1.3.mine/debian/patches/50-getlogin_r.dpatch
--- snoopy-1.3/debian/patches/50-getlogin_r.dpatch      1969-12-31 
19:00:00.000000000 -0500
+++ snoopy-1.3.mine/debian/patches/50-getlogin_r.dpatch 2007-02-05 
14:42:17.000000000 -0500
@@ -0,0 +1,42 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50-Fix-NULL-getlogin.dpatch by  <Mike O'Connor <[EMAIL PROTECTED]>>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad snoopy-1.3.mine~/snoopy.c snoopy-1.3.mine/snoopy.c
+--- snoopy-1.3.mine~/snoopy.c  2007-02-05 14:41:34.000000000 -0500
++++ snoopy-1.3.mine/snoopy.c   2007-02-05 14:42:11.000000000 -0500
+@@ -26,6 +26,7 @@
+ #include <dlfcn.h>
+ #include <syslog.h>
+ #include "snoopy.h"
++#include "string.h"
+ 
+ #define min(a,b) a<b?a:b
+ 
+@@ -41,6 +42,7 @@
+       static char *logstring=NULL; 
+       static int argc, size=0;
+       register int i, spos=0;
++      static char login[256];
+       #if INTEGRITY_CHECK
+       static char **argv_copy;
+       static int *t_size;
+@@ -96,9 +98,13 @@
+          free(*(argv_copy+i));
+       #endif
+ 
+-      syslog(LOG_INFO, "[%s, uid:%d sid:%d]: %s", getlogin(), getuid(), 
getsid(0), logstring); 
+-      free(logstring);
++      getlogin_r( login, 255 );
++      if( login == 0 ) {
++          strcpy(login,"unknown");
++      }
+ 
++      syslog(LOG_INFO, "[%s, uid:%d sid:%d]: %s", login, getuid(), getsid(0), 
logstring); 
++      free(logstring);
+ }
+ 
+ int execve(const char *filename, char **argv, char **envp) {

Attachment: signature.asc
Description: Digital signature

Reply via email to